add NOSESSIONHEADER env variable

1 files changed, 16 insertions, 19 deletions

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