max_parallel transport option. Bug 1698

[exim.git] / src / src / smtp_in.c

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 998245137f2a65d84de9854dc08b14fcd84fa044..9aacef1fcb8abc8ebaccf27d2e75441636598b44 100644 (file)
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -3322,12 +3322,10 @@ while (done <= 0)
        {
        smtp_cmd_data = NULL;
 
-       if ((c = smtp_in_auth(au, &s, &ss)) != OK)
-         log_write(0, LOG_MAIN|LOG_REJECT, "%s authenticator failed for %s: %s",
-           au->name, host_and_ident(FALSE), ss);
-       else
+       if (smtp_in_auth(au, &s, &ss) == OK)
          DEBUG(D_auth) debug_printf("tls auth succeeded\n");
-
+       else
+         DEBUG(D_auth) debug_printf("tls auth not succeeded\n");
        break;
        }
     }
@@ -4981,7 +4979,7 @@ while (done <= 0)
     /* If ETRN queue runs are to be serialized, check the database to
     ensure one isn't already running. */
 
-    if (smtp_etrn_serialize && !enq_start(etrn_serialize_key))
+    if (smtp_etrn_serialize && !enq_start(etrn_serialize_key, 1))
       {
       smtp_printf("458 Already processing %s\r\n", smtp_cmd_data);
       break;