buglet in qmail-smtpd.c

[Henning Brauer]

--- qmail-smtpd.c.orig  Fri May 17 18:33:57 2002
+++ qmail-smtpd.c       Fri May 17 18:40:37 2002
@@ -282,26 +282,13 @@
 
   rblok = rblinit();
   if (rblok == -1) die_control();
-
+   
   errdisconnect = (env_get("SMTP550DISCONNECT") ? 1:0);
-  if (errdisconnect) logstring(2,", smtp550disconnect enabled");
-
   nobounce = (env_get("NOBOUNCE") ? 1:0);
-  if (nobounce) logstring(2,", nobounce enabled");
-
   sanitycheck = (env_get("SANITYCHECK") ? 1:0);
-  if (sanitycheck) logstring(2,", sanitycheck enabled");
-
   returnmxcheck = (env_get("RETURNMXCHECK") ? 1:0);
-  if (returnmxcheck) logstring(2,", returnmxcheck enabled");
-
   blockrelayprobe = (env_get("BLOCKRELAYPROBE") ? 1:0);
-  if (blockrelayprobe) logstring(2,", blockrelayprobe enabled");
-
   relayok = relayclient = env_get("RELAYCLIENT");
-  if (relayclient) logstring(2,", relayclient set");
-
-  logflush(2);
 
   if (control_readint(&databytes,"control/databytes") == -1) die_control();
   x = env_get("DATABYTES");
@@ -323,6 +310,14 @@
   if (!local) local = "unknown";
   logstring(2,local);
 
+  logstring(2, ":");
+  if (errdisconnect) logstring(2,"smtp550disconnect");
+  if (nobounce) logstring(2,"nobounce");
+  if (sanitycheck) logstring(2,"sanitycheck");
+  if (returnmxcheck) logstring(2,"returnmxcheck");
+  if (blockrelayprobe) logstring(2,"blockrelayprobe");
+  if (relayclient) logstring(2,"relayclient");
+   
   logflush(2);
   dohelo(remotehost);
 }