Add X-UD-Smtp-Session to unauthed smtp session aswell

1 files changed, 14 insertions, 14 deletions

diff --git a/received.c b/received.c
index f38545e..0b51c39 100644
--- a/received.c
+++ b/received.c
@@ -36,15 +36,12 @@ 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" */
+/* "X-UD-Smtp-Session: sessionid */
 
-void received(qqt,protocol,local,remoteip,remotehost,remoteinfo,helo)
-struct qmail *qqt;
-char *protocol;
-char *local;
-char *remoteip;
-char *remotehost;
-char *remoteinfo;
-char *helo;
+void received(const struct qmail *qqt,
+  const char *protocol, const char *local,
+  const char *remoteip, const char *remotehost, const char *remoteinfo,
+  const char *remotesession, const char *helo)
 {
   struct datetime dt;
 
@@ -68,17 +65,19 @@ char *helo;
   qmail_puts(qqt,"; ");
   datetime_tai(&dt,now());
   qmail_put(qqt,buf,date822fmt(buf,&dt));
+
+  if (remotesession) {
+    qmail_puts(qqt,"X-UD-Smtp-Session: ");
+    qmail_puts(qqt,remotesession);
+    qmail_put(qqt,"\n",1);
+  }
 }
 
 /* "Received: by silverton.berkeley.edu with SMTP; 26 Sep 1995 04:46:54 -0000\n"
  * "X-UD-Smtp-Session: user@sessionid */
 
-void received_authed(qqt,protocol,local,remoteinfo,remotesession)
-struct qmail *qqt;
-char *protocol;
-char *local;
-char *remoteinfo;
-char *remotesession;
+void received_authed(const struct qmail *qqt, const char *protocol,
+  const char *local, const char *remoteinfo, const char *remotesession)
 {
   struct datetime dt;
 
@@ -89,6 +88,7 @@ char *remotesession;
   qmail_puts(qqt,"; ");
   datetime_tai(&dt,now());
   qmail_put(qqt,buf,date822fmt(buf,&dt));
+
   if (remoteinfo || remotesession) {
     qmail_puts(qqt,"X-UD-Smtp-Session: ");
     if (remoteinfo) {