1 files changed, 4 insertions, 2 deletions

diff --git a/qmail-smtpd.c b/qmail-smtpd.c
index f038314..5ea23dc 100644
--- a/qmail-smtpd.c
+++ b/qmail-smtpd.c
@@ -970,9 +970,11 @@ void smtp_data(arg) char *arg; {
   }
 
   if (flagauth)
-    received_authed(&qqt,protocol,local,remoteinfo,client_get_session_id()->s);
+    received_authed(&qqt,protocol,local);
   else
-    received(&qqt,protocol,local,remoteip,remotehost,remoteinfo,client_get_session_id()->s,fakehelo);
+    received(&qqt,protocol,local,remoteip,remotehost,remoteinfo,fakehelo);
+  if (!env_get("NOSESSIONHEADER"))
+    xsmtpsession(&qqt, (flagauth) ? remoteinfo : NULL, client_get_session_id()->s);
   qmail_put(&qqt,sppheaders.s,sppheaders.len); /* set in qmail-spp.c */
   spp_rset();
   blast(&hops);