X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/1e1ddfac79fbcd052f199500a6493c7f79cb8462..5fbb51949cbd9765421c5832c2d391f80f8183e9:/src/src/smtp_in.c

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index d72adc15c..ce27c5f3e 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -227,7 +227,7 @@ static smtp_cmd_list *cmd_list_end =
 /* This list of names is used for performing the smtp_no_mail logging action.
 It must be kept in step with the SCH_xxx enumerations. */
 
-static uschar *smtp_names[] =
+uschar * smtp_names[] =
   {
   US"NONE", US"AUTH", US"DATA", US"BDAT", US"EHLO", US"ETRN", US"EXPN",
   US"HELO", US"HELP", US"MAIL", US"NOOP", US"QUIT", US"RCPT", US"RSET",
@@ -1801,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
@@ -2056,7 +2056,9 @@ 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 */
+recipient_verify_failure = NULL;
 deliver_localpart_parent = deliver_localpart_orig = NULL;
 deliver_domain_parent = deliver_domain_orig = NULL;
 callout_address = NULL;
@@ -5172,9 +5174,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 */
@@ -5189,8 +5191,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"");
 	}