--- received.c.orig 1998-06-15 +++ received.c 2007-03-21 --- .././qmail-1.03/received.c Mon Jun 15 12:53:16 1998 +++ ../qmail-1.03.2418/received.c Thu Jun 8 22:50:43 2006 @@ -34,10 +34,11 @@ static char buf[DATE822FMT]; -/* "Received: from relay1.uu.net (HELO uunet.uu.net) (7@192.48.96.5)\n" */ -/* " by silverton.berkeley.edu with SMTP; 26 Sep 1995 04:46:54 -0000\n" */ +/* "Received: from relay1.uu.net (HELO uunet.uu.net) (user@192.48.96.5)" */ +/* " (de-)crypted with tls-version: cipher [used/perm] DN=dn" */ +/* " by silverton.berkeley.edu with SMTP; 26 Sep 1995 04:46:54 -0000" */ -void received(qqt,protocol,local,remoteip,remotehost,remoteinfo,helo) +void received(qqt,protocol,local,remoteip,remotehost,remoteinfo,helo,tlsinfo) struct qmail *qqt; char *protocol; char *local; @@ -45,6 +46,7 @@ char *remotehost; char *remoteinfo; char *helo; +char *tlsinfo; { struct datetime dt; @@ -61,7 +63,12 @@ qmail_puts(qqt,"@"); } safeput(qqt,remoteip); - qmail_puts(qqt,")\n by "); + qmail_puts(qqt,")"); + if (tlsinfo) { + qmail_puts(qqt,"\n (de-)crypted with "); + qmail_puts(qqt,tlsinfo); + } + qmail_puts(qqt,"\n by "); safeput(qqt,local); qmail_puts(qqt," with "); qmail_puts(qqt,protocol);