X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/46d2a5e6f6e7709d172903b13945d23fc0a2c888..0de9945258c2e7910c35f715caf07c5e9270aa1b:/src/src/smtp_in.c

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 9055020e1..2b4323bec 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2020 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for handling an incoming SMTP call. */
@@ -1800,7 +1801,7 @@ s_tlslog(gstring * g)
 if (LOGGING(tls_cipher) && tls_in.cipher)
   {
   g = string_append(g, 2, US" X=", tls_in.cipher);
-#ifdef EXPERIMENTAL_TLS_RESUME
+#ifndef DISABLE_TLS_RESUME
   if (LOGGING(tls_resumption) && tls_in.resumption & RESUME_USED)
     g = string_catn(g, US"*", 1);
 #endif
@@ -2055,7 +2056,8 @@ f.active_local_from_check = local_from_check;          /* Can be set by ACL */
 f.active_local_sender_retain = local_sender_retain;    /* Can be set by ACL */
 sending_ip_address = NULL;
 return_path = sender_address = NULL;
-sender_data = NULL;				     /* Can be set by ACL */
+deliver_localpart_data = deliver_domain_data =
+recipient_data = sender_data = NULL;			/* Can be set by ACL */
 deliver_localpart_parent = deliver_localpart_orig = NULL;
 deliver_domain_parent = deliver_domain_orig = NULL;
 callout_address = NULL;
@@ -3039,7 +3041,7 @@ if (!check_sync())
 #endif
     {
     unsigned n = smtp_inend - smtp_inptr;
-    if (n > 32) n = 32;
+    if (n > 128) n = 128;
 
     log_write(0, LOG_MAIN|LOG_REJECT, "SMTP protocol "
       "synchronization error (input sent without waiting for greeting): "
@@ -3194,7 +3196,7 @@ for (;;)
     {
     smtp_printf("%.3s-%.*s%.*s\r\n", TRUE, code, esclen, esc, (int)(nl - msg), msg);
     msg = nl + 1;
-    while (isspace(*msg)) msg++;
+    Uskip_whitespace(&msg);
     }
   }
 }
@@ -4861,8 +4863,8 @@ while (done <= 0)
       and EXPN etc. to be used when space is short. */
 
       if (!receive_check_fs(
-	   (smtp_check_spool_space && message_size >= 0)?
-	      message_size + 5000 : 0))
+	   smtp_check_spool_space && message_size >= 0
+	      ? message_size + 5000 : 0))
 	{
 	smtp_printf("452 Space shortage, please try later\r\n", FALSE);
 	sender_address = NULL;
@@ -5171,9 +5173,9 @@ while (done <= 0)
 	recipients_list[recipients_count-1].orcpt = orcpt;
 	recipients_list[recipients_count-1].dsn_flags = dsn_flags;
 
-	DEBUG(D_receive) debug_printf("DSN: orcpt: %s  flags: %d\n",
+	/* DEBUG(D_receive) debug_printf("DSN: orcpt: %s  flags: %d\n",
 	  recipients_list[recipients_count-1].orcpt,
-	  recipients_list[recipients_count-1].dsn_flags);
+	  recipients_list[recipients_count-1].dsn_flags); */
 	}
 
       /* The recipient was discarded */
@@ -5188,8 +5190,8 @@ while (done <= 0)
 	discarded = TRUE;
 	log_write(0, LOG_MAIN|LOG_REJECT, "%s F=<%s> RCPT %s: "
 	  "discarded by %s ACL%s%s", host_and_ident(TRUE),
-	  sender_address_unrewritten? sender_address_unrewritten : sender_address,
-	  smtp_cmd_argument, f.recipients_discarded? "MAIL" : "RCPT",
+	  sender_address_unrewritten ? sender_address_unrewritten : sender_address,
+	  smtp_cmd_argument, f.recipients_discarded ? "MAIL" : "RCPT",
 	  log_msg ? US": " : US"", log_msg ? log_msg : US"");
 	}