1.1 --- a/src/accept.c	Tue Dec 07 19:21:44 2010 -0300
     1.2 +++ b/src/accept.c	Wed Dec 08 17:17:38 2010 -0300
     1.3 @@ -367,23 +367,29 @@
     1.4  		for_string = g_strdup_printf(" for %s", addr_string(addr));
     1.5  	}
     1.6  
     1.7 -	if (msg->received_host == NULL) {
     1.8 +	if (!msg->received_host) {
     1.9  		/* received locally */
    1.10 -		hdr = create_header(HEAD_RECEIVED, "Received: from %s by %s with %s (%s %s) id %s%s; %s\n",
    1.11 -		                    passwd->pw_name, conf.host_name, prot_names[msg->received_prot],
    1.12 -		                    PACKAGE, VERSION, msg->uid, for_string ? for_string : "", rec_timestamp());
    1.13 +		hdr = create_header(HEAD_RECEIVED,
    1.14 +		    "Received: from %s by %s with %s (%s %s) id %s%s; %s\n",
    1.15 +		    passwd->pw_name, conf.host_name,
    1.16 +		    prot_names[msg->received_prot], PACKAGE, VERSION,
    1.17 +		    msg->uid, for_string ? for_string : "", rec_timestamp());
    1.18  	} else {
    1.19  		/* received from remote */
    1.20  #ifdef ENABLE_IDENT
    1.21  		DEBUG(5) debugf("adding 'Received:' header (5)\n");
    1.22 -		hdr = create_header(HEAD_RECEIVED, "Received: from %s (ident=%s) by %s with %s (%s %s) id %s%s; %s\n",
    1.23 -		                    msg->received_host, msg->ident ? msg->ident : "unknown", conf.host_name,
    1.24 -		                    prot_names[msg->received_prot], PACKAGE, VERSION, msg->uid, for_string ? for_string : "",
    1.25 -		                    rec_timestamp());
    1.26 +		hdr = create_header(HEAD_RECEIVED,
    1.27 +		    "Received: from %s (ident=%s) by %s with %s (%s %s) id %s%s; %s\n",
    1.28 +		    msg->received_host, msg->ident ? msg->ident : "unknown",
    1.29 +		    conf.host_name, prot_names[msg->received_prot], PACKAGE,
    1.30 +		    VERSION, msg->uid, for_string ? for_string : "",
    1.31 +		    rec_timestamp());
    1.32  #else
    1.33 -		hdr = create_header(HEAD_RECEIVED, "Received: from %s by %s with %s (%s %s) id %s%s; %s\n",
    1.34 -		                    msg->received_host, conf.host_name, prot_names[msg->received_prot],
    1.35 -		                    PACKAGE, VERSION, msg->uid, for_string ? for_string : "", rec_timestamp());
    1.36 +		hdr = create_header(HEAD_RECEIVED,
    1.37 +		    "Received: from %s by %s with %s (%s %s) id %s%s; %s\n",
    1.38 +		    msg->received_host, conf.host_name,
    1.39 +		    prot_names[msg->received_prot], PACKAGE, VERSION,
    1.40 +		    msg->uid, for_string ? for_string : "", rec_timestamp());
    1.41  #endif
    1.42  	}
    1.43  	header_fold(hdr);