masqmail
changeset 362:9d49dffc3070
minor rework
| author | markus schnalke <meillo@marmaro.de> |
|---|---|
| date | Wed, 14 Sep 2011 11:50:45 +0200 |
| parents | 4916f9df5051 |
| children | 02bc0331e390 |
| files | src/accept.c |
| diffstat | 1 files changed, 5 insertions(+), 8 deletions(-) [+] |
line diff
1.1 --- a/src/accept.c Sun Sep 04 17:43:09 2011 +0200 1.2 +++ b/src/accept.c Wed Sep 14 11:50:45 2011 +0200 1.3 @@ -377,21 +377,18 @@ 1.4 msg->uid, for_string ? for_string : "", rec_timestamp()); 1.5 } else { 1.6 /* received from remote */ 1.7 -#ifdef ENABLE_IDENT 1.8 DEBUG(5) debugf("adding 'Received:' header (5)\n"); 1.9 hdr = create_header(HEAD_RECEIVED, 1.10 +#ifdef ENABLE_IDENT 1.11 "Received: from %s (ident=%s)\n\tby %s with %s (%s %s)\n\tid %s%s; %s\n", 1.12 msg->received_host, msg->ident ? msg->ident : "unknown", 1.13 +#else 1.14 + "Received: from %s\n\tby %s with %s (%s %s)\n\tid %s%s; %s\n", 1.15 + msg->received_host, 1.16 +#endif 1.17 conf.host_name, prot_names[msg->received_prot], PACKAGE, 1.18 VERSION, msg->uid, for_string ? for_string : "", 1.19 rec_timestamp()); 1.20 -#else 1.21 - hdr = create_header(HEAD_RECEIVED, 1.22 - "Received: from %s\n\tby %s with %s (%s %s)\n\tid %s%s; %s\n", 1.23 - msg->received_host, conf.host_name, 1.24 - prot_names[msg->received_prot], PACKAGE, VERSION, 1.25 - msg->uid, for_string ? for_string : "", rec_timestamp()); 1.26 -#endif 1.27 } 1.28 msg->hdr_list = g_list_prepend(msg->hdr_list, hdr); 1.29