1 files changed, 5 insertions, 2 deletions

diff --git a/qmail-smtpd.c b/qmail-smtpd.c
index 1036eef..20027b0 100644
--- a/qmail-smtpd.c
+++ b/qmail-smtpd.c
@@ -63,6 +63,7 @@ char *remotehost;
 char *remoteinfo;
 char *local;
 char *relayclient;
+static const stralloc *client_get_session_id();
 
 #ifdef TLS
 # include <sys/stat.h>
@@ -346,6 +347,9 @@ void setup()
   else
 #endif
   dohelo(remotehost);
+
+  /* generate session */
+  (void)client_get_session_id();
 }
 
 
@@ -959,7 +963,7 @@ void smtp_data(arg) char *arg; {
   if (flagauth)
     received_authed(&qqt,protocol,local,remoteinfo,client_get_session_id()->s);
   else
-    received(&qqt,protocol,local,remoteip,remotehost,remoteinfo,fakehelo);
+    received(&qqt,protocol,local,remoteip,remotehost,remoteinfo,client_get_session_id()->s,fakehelo);
   qmail_put(&qqt,sppheaders.s,sppheaders.len); /* set in qmail-spp.c */
   spp_rset();
   blast(&hops);
@@ -1244,7 +1248,6 @@ char *arg;
 
   switch (authcmds[i].fun(arg)) {
     case 0:
-      (void)client_get_session_id(); /* generate session */
       if (!spp_auth(authcmds[i].text, user.s)) return;
       flagauth = 1;
       if (ssl) {