String-handling: rename string_cat() to string_catn() and intro a new string_cat()

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

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 4761220451193e09209a4c40f9961ffe20c52589..1398e620b6e7bc2e9116da8cc5c5a7c9673627b5 100644 (file)
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -2,13 +2,14 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2015 */
+/* Copyright (c) University of Cambridge 1995 - 2016 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for handling an incoming SMTP call. */
 
 
 #include "exim.h"
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for handling an incoming SMTP call. */
 
 
 #include "exim.h"

+#include <assert.h>

 
 
 /* Initialize for TCP wrappers if so configured. It appears that the macro
 
 
 /* Initialize for TCP wrappers if so configured. It appears that the macro


@@ -36,10 +37,10 @@ uschar *tcp_wrappers_name;
 /* Size of buffer for reading SMTP commands. We used to use 512, as defined
 by RFC 821. However, RFC 1869 specifies that this must be increased for SMTP
 commands that accept arguments, and this in particular applies to AUTH, where
 /* Size of buffer for reading SMTP commands. We used to use 512, as defined
 by RFC 821. However, RFC 1869 specifies that this must be increased for SMTP
 commands that accept arguments, and this in particular applies to AUTH, where

-the data can be quite long.  More recently this value was 2048 in Exim; 
+the data can be quite long.  More recently this value was 2048 in Exim;

 however, RFC 4954 (circa 2007) recommends 12288 bytes to handle AUTH.  Clients
 however, RFC 4954 (circa 2007) recommends 12288 bytes to handle AUTH.  Clients

-such as Thunderbird will send an AUTH with an initial-response for GSSAPI. 
-The maximum size of a Kerberos ticket under Windows 2003 is 12000 bytes, and 
+such as Thunderbird will send an AUTH with an initial-response for GSSAPI.
+The maximum size of a Kerberos ticket under Windows 2003 is 12000 bytes, and

 we need room to handle large base64-encoded AUTHs for GSSAPI.
 */
 
 we need room to handle large base64-encoded AUTHs for GSSAPI.
 */
 


@@ -95,7 +96,7 @@ enum {
 
   QUIT_CMD, HELP_CMD,
 
 
   QUIT_CMD, HELP_CMD,
 

-#ifdef EXPERIMENTAL_PROXY
+#ifdef SUPPORT_PROXY

   PROXY_FAIL_IGNORE_CMD,
 #endif
 
   PROXY_FAIL_IGNORE_CMD,
 #endif
 


@@ -134,7 +135,7 @@ static BOOL rcpt_smtp_response_same;
 static BOOL rcpt_in_progress;
 static int  nonmail_command_count;
 static BOOL smtp_exit_function_called = 0;
 static BOOL rcpt_in_progress;
 static int  nonmail_command_count;
 static BOOL smtp_exit_function_called = 0;

-#ifdef EXPERIMENTAL_INTERNATIONAL
+#ifdef SUPPORT_I18N

 static BOOL smtputf8_advertised;
 #endif
 static int  synprot_error_count;
 static BOOL smtputf8_advertised;
 #endif
 static int  synprot_error_count;


@@ -159,7 +160,10 @@ AUTH is already forbidden. After a TLS session is started, AUTH's flag is again
 forced TRUE, to allow for the re-authentication that can happen at that point.
 
 QUIT is also "falsely" labelled as a mail command so that it doesn't up the
 forced TRUE, to allow for the re-authentication that can happen at that point.
 
 QUIT is also "falsely" labelled as a mail command so that it doesn't up the

-count of non-mail commands and possibly provoke an error. */
+count of non-mail commands and possibly provoke an error.
+
+tls_auth is a pseudo-command, never expected in input.  It is activated
+on TLS startup and looks for a tls authenticator. */

 
 static smtp_cmd_list cmd_list[] = {
   /* name         len                     cmd     has_arg is_mail_cmd */
 
 static smtp_cmd_list cmd_list[] = {
   /* name         len                     cmd     has_arg is_mail_cmd */


@@ -229,15 +233,15 @@ static uschar *protocols[] = {
 
 /* Sanity check and validate optional args to MAIL FROM: envelope */
 enum {
 
 /* Sanity check and validate optional args to MAIL FROM: envelope */
 enum {

+  ENV_MAIL_OPT_NULL,

   ENV_MAIL_OPT_SIZE, ENV_MAIL_OPT_BODY, ENV_MAIL_OPT_AUTH,
 #ifndef DISABLE_PRDR
   ENV_MAIL_OPT_PRDR,
 #endif
   ENV_MAIL_OPT_RET, ENV_MAIL_OPT_ENVID,
   ENV_MAIL_OPT_SIZE, ENV_MAIL_OPT_BODY, ENV_MAIL_OPT_AUTH,
 #ifndef DISABLE_PRDR
   ENV_MAIL_OPT_PRDR,
 #endif
   ENV_MAIL_OPT_RET, ENV_MAIL_OPT_ENVID,

-#ifdef EXPERIMENTAL_INTERNATIONAL
+#ifdef SUPPORT_I18N

   ENV_MAIL_OPT_UTF8,
 #endif
   ENV_MAIL_OPT_UTF8,
 #endif

-  ENV_MAIL_OPT_NULL

   };
 typedef struct {
   uschar *   name;  /* option requested during MAIL cmd */
   };
 typedef struct {
   uschar *   name;  /* option requested during MAIL cmd */


@@ -254,10 +258,11 @@ static env_mail_type_t env_mail_type_list[] = {
 #endif
     { US"RET",    ENV_MAIL_OPT_RET,    TRUE },
     { US"ENVID",  ENV_MAIL_OPT_ENVID,  TRUE },
 #endif
     { US"RET",    ENV_MAIL_OPT_RET,    TRUE },
     { US"ENVID",  ENV_MAIL_OPT_ENVID,  TRUE },

-#ifdef EXPERIMENTAL_INTERNATIONAL
+#ifdef SUPPORT_I18N

     { US"SMTPUTF8",ENV_MAIL_OPT_UTF8,  FALSE },                /* rfc6531 */
 #endif
     { US"SMTPUTF8",ENV_MAIL_OPT_UTF8,  FALSE },                /* rfc6531 */
 #endif

-    { US"NULL",   ENV_MAIL_OPT_NULL,   FALSE }
+    /* keep this the last entry */
+    { US"NULL",   ENV_MAIL_OPT_NULL,   FALSE },

   };
 
 /* When reading SMTP from a remote host, we have to use our own versions of the
   };
 
 /* When reading SMTP from a remote host, we have to use our own versions of the


@@ -578,7 +583,7 @@ exim_exit(EXIT_FAILURE);
 
 
 
 
 
 

-#ifdef EXPERIMENTAL_PROXY
+#ifdef SUPPORT_PROXY

 /*************************************************
 *     Restore socket timeout to previous value   *
 *************************************************/
 /*************************************************
 *     Restore socket timeout to previous value   *
 *************************************************/


@@ -615,7 +620,7 @@ int rc;
 /* Cannot configure local connection as a proxy inbound */
 if (sender_host_address == NULL) return proxy_session;
 
 /* Cannot configure local connection as a proxy inbound */
 if (sender_host_address == NULL) return proxy_session;
 

-rc = verify_check_this_host(&proxy_required_hosts, NULL, NULL,
+rc = verify_check_this_host(CUSS &hosts_proxy, NULL, NULL,

                            sender_host_address, NULL);
 if (rc == OK)
   {
                            sender_host_address, NULL);
 if (rc == OK)
   {


@@ -756,10 +761,10 @@ if (ret >= 16 &&
             DEBUG(D_receive) debug_printf("Invalid %s source IP\n", iptype);
             return ERRNO_PROXYFAIL;
             }
             DEBUG(D_receive) debug_printf("Invalid %s source IP\n", iptype);
             return ERRNO_PROXYFAIL;
             }

-          proxy_host_address  = sender_host_address;
+          proxy_local_address = sender_host_address;

           sender_host_address = string_copy(US tmpip);
           tmpport             = ntohs(hdr.v2.addr.ip4.src_port);
           sender_host_address = string_copy(US tmpip);
           tmpport             = ntohs(hdr.v2.addr.ip4.src_port);

-          proxy_host_port     = sender_host_port;
+          proxy_local_port    = sender_host_port;

           sender_host_port    = tmpport;
           /* Save dest ip/port */
           tmpaddr.sin_addr.s_addr = hdr.v2.addr.ip4.dst_addr;
           sender_host_port    = tmpport;
           /* Save dest ip/port */
           tmpaddr.sin_addr.s_addr = hdr.v2.addr.ip4.dst_addr;


@@ -769,9 +774,9 @@ if (ret >= 16 &&
             DEBUG(D_receive) debug_printf("Invalid %s dest port\n", iptype);
             return ERRNO_PROXYFAIL;
             }
             DEBUG(D_receive) debug_printf("Invalid %s dest port\n", iptype);
             return ERRNO_PROXYFAIL;
             }

-          proxy_target_address = string_copy(US tmpip);
+          proxy_external_address = string_copy(US tmpip);

           tmpport              = ntohs(hdr.v2.addr.ip4.dst_port);
           tmpport              = ntohs(hdr.v2.addr.ip4.dst_port);

-          proxy_target_port    = tmpport;
+          proxy_external_port  = tmpport;

           goto done;
         case 0x21:  /* TCPv6 address type */
           iptype = US"IPv6";
           goto done;
         case 0x21:  /* TCPv6 address type */
           iptype = US"IPv6";


@@ -782,10 +787,10 @@ if (ret >= 16 &&
             DEBUG(D_receive) debug_printf("Invalid %s source IP\n", iptype);
             return ERRNO_PROXYFAIL;
             }
             DEBUG(D_receive) debug_printf("Invalid %s source IP\n", iptype);
             return ERRNO_PROXYFAIL;
             }

-          proxy_host_address  = sender_host_address;
+          proxy_local_address = sender_host_address;

           sender_host_address = string_copy(US tmpip6);
           tmpport             = ntohs(hdr.v2.addr.ip6.src_port);
           sender_host_address = string_copy(US tmpip6);
           tmpport             = ntohs(hdr.v2.addr.ip6.src_port);

-          proxy_host_port     = sender_host_port;
+          proxy_local_port    = sender_host_port;

           sender_host_port    = tmpport;
           /* Save dest ip/port */
           memmove(tmpaddr6.sin6_addr.s6_addr, hdr.v2.addr.ip6.dst_addr, 16);
           sender_host_port    = tmpport;
           /* Save dest ip/port */
           memmove(tmpaddr6.sin6_addr.s6_addr, hdr.v2.addr.ip6.dst_addr, 16);


@@ -795,9 +800,9 @@ if (ret >= 16 &&
             DEBUG(D_receive) debug_printf("Invalid %s dest port\n", iptype);
             return ERRNO_PROXYFAIL;
             }
             DEBUG(D_receive) debug_printf("Invalid %s dest port\n", iptype);
             return ERRNO_PROXYFAIL;
             }

-          proxy_target_address = string_copy(US tmpip6);
+          proxy_external_address = string_copy(US tmpip6);

           tmpport              = ntohs(hdr.v2.addr.ip6.dst_port);
           tmpport              = ntohs(hdr.v2.addr.ip6.dst_port);

-          proxy_target_port    = tmpport;
+          proxy_external_port  = tmpport;

           goto done;
         default:
           DEBUG(D_receive)
           goto done;
         default:
           DEBUG(D_receive)


@@ -876,7 +881,7 @@ else if (ret >= 8 &&
       debug_printf("Proxied src arg is not an %s address\n", iptype);
     goto proxyfail;
     }
       debug_printf("Proxied src arg is not an %s address\n", iptype);
     goto proxyfail;
     }

-  proxy_host_address = sender_host_address;
+  proxy_local_address = sender_host_address;

   sender_host_address = p;
   p = sp + 1;
   if ((sp = Ustrchr(p, ' ')) == NULL)
   sender_host_address = p;
   p = sp + 1;
   if ((sp = Ustrchr(p, ' ')) == NULL)


@@ -892,7 +897,7 @@ else if (ret >= 8 &&
       debug_printf("Proxy dest arg is not an %s address\n", iptype);
     goto proxyfail;
     }
       debug_printf("Proxy dest arg is not an %s address\n", iptype);
     goto proxyfail;
     }

-  proxy_target_address = p;
+  proxy_external_address = p;

   p = sp + 1;
   if ((sp = Ustrchr(p, ' ')) == NULL)
     {
   p = sp + 1;
   if ((sp = Ustrchr(p, ' ')) == NULL)
     {


@@ -907,7 +912,7 @@ else if (ret >= 8 &&
       debug_printf("Proxied src port '%s' not an integer\n", p);
     goto proxyfail;
     }
       debug_printf("Proxied src port '%s' not an integer\n", p);
     goto proxyfail;
     }

-  proxy_host_port = sender_host_port;
+  proxy_local_port = sender_host_port;

   sender_host_port = tmp_port;
   p = sp + 1;
   if ((sp = Ustrchr(p, '\0')) == NULL)
   sender_host_port = tmp_port;
   p = sp + 1;
   if ((sp = Ustrchr(p, '\0')) == NULL)


@@ -922,7 +927,7 @@ else if (ret >= 8 &&
       debug_printf("Proxy dest port '%s' not an integer\n", p);
     goto proxyfail;
     }
       debug_printf("Proxy dest port '%s' not an integer\n", p);
     goto proxyfail;
     }

-  proxy_target_port = tmp_port;
+  proxy_external_port = tmp_port;

   /* Already checked for /r /n above. Good V1 header received. */
   goto done;
   }
   /* Already checked for /r /n above. Good V1 header received. */
   goto done;
   }


@@ -1020,7 +1025,7 @@ if required. */
 
 for (p = cmd_list; p < cmd_list_end; p++)
   {
 
 for (p = cmd_list; p < cmd_list_end; p++)
   {

-  #ifdef EXPERIMENTAL_PROXY
+  #ifdef SUPPORT_PROXY

   /* Only allow QUIT command if Proxy Protocol parsing failed */
   if (proxy_session && proxy_session_failed)
     {
   /* Only allow QUIT command if Proxy Protocol parsing failed */
   if (proxy_session && proxy_session_failed)
     {


@@ -1028,10 +1033,12 @@ for (p = cmd_list; p < cmd_list_end; p++)
       continue;
     }
   #endif
       continue;
     }
   #endif

-  if (strncmpic(smtp_cmd_buffer, US p->name, p->len) == 0 &&
-       (smtp_cmd_buffer[p->len-1] == ':' ||   /* "mail from:" or "rcpt to:" */
-        smtp_cmd_buffer[p->len] == 0 ||
-        smtp_cmd_buffer[p->len] == ' '))
+  if (  p->len
+     && strncmpic(smtp_cmd_buffer, US p->name, p->len) == 0
+     && (  smtp_cmd_buffer[p->len-1] == ':'    /* "mail from:" or "rcpt to:" */
+        || smtp_cmd_buffer[p->len] == 0
+       || smtp_cmd_buffer[p->len] == ' '
+     )  )

     {
     if (smtp_inptr < smtp_inend &&                     /* Outstanding input */
         p->cmd < sync_cmd_limit &&                     /* Command should sync */
     {
     if (smtp_inptr < smtp_inend &&                     /* Outstanding input */
         p->cmd < sync_cmd_limit &&                     /* Command should sync */


@@ -1075,7 +1082,7 @@ for (p = cmd_list; p < cmd_list_end; p++)
     }
   }
 
     }
   }
 

-#ifdef EXPERIMENTAL_PROXY
+#ifdef SUPPORT_PROXY

 /* Only allow QUIT command if Proxy Protocol parsing failed */
 if (proxy_session && proxy_session_failed)
   return PROXY_FAIL_IGNORE_CMD;
 /* Only allow QUIT command if Proxy Protocol parsing failed */
 if (proxy_session && proxy_session_failed)
   return PROXY_FAIL_IGNORE_CMD;


@@ -1227,8 +1234,7 @@ if (sender_host_unknown || sender_host_notsocket)
 if (is_inetd)
   return string_sprintf("SMTP connection from %s (via inetd)", hostname);
 
 if (is_inetd)
   return string_sprintf("SMTP connection from %s (via inetd)", hostname);
 

-if ((log_extra_selector & LX_incoming_interface) != 0 &&
-     interface_address != NULL)
+if (LOGGING(incoming_interface) && interface_address != NULL)

   return string_sprintf("SMTP connection from %s I=[%s]:%d", hostname,
     interface_address, interface_port);
 
   return string_sprintf("SMTP connection from %s I=[%s]:%d", hostname,
     interface_address, interface_port);
 


@@ -1253,16 +1259,15 @@ s_tlslog(uschar * s, int * sizep, int * ptrp)
   int size = sizep ? *sizep : 0;
   int ptr = ptrp ? *ptrp : 0;
 
   int size = sizep ? *sizep : 0;
   int ptr = ptrp ? *ptrp : 0;
 

-  if ((log_extra_selector & LX_tls_cipher) != 0 && tls_in.cipher != NULL)
+  if (LOGGING(tls_cipher) && tls_in.cipher != NULL)

     s = string_append(s, &size, &ptr, 2, US" X=", tls_in.cipher);
     s = string_append(s, &size, &ptr, 2, US" X=", tls_in.cipher);

-  if ((log_extra_selector & LX_tls_certificate_verified) != 0 &&
-       tls_in.cipher != NULL)
+  if (LOGGING(tls_certificate_verified) && tls_in.cipher != NULL)

     s = string_append(s, &size, &ptr, 2, US" CV=",
       tls_in.certificate_verified? "yes":"no");
     s = string_append(s, &size, &ptr, 2, US" CV=",
       tls_in.certificate_verified? "yes":"no");

-  if ((log_extra_selector & LX_tls_peerdn) != 0 && tls_in.peerdn != NULL)
+  if (LOGGING(tls_peerdn) && tls_in.peerdn != NULL)

     s = string_append(s, &size, &ptr, 3, US" DN=\"",
       string_printing(tls_in.peerdn), US"\"");
     s = string_append(s, &size, &ptr, 3, US" DN=\"",
       string_printing(tls_in.peerdn), US"\"");

-  if ((log_extra_selector & LX_tls_sni) != 0 && tls_in.sni != NULL)
+  if (LOGGING(tls_sni) && tls_in.sni != NULL)

     s = string_append(s, &size, &ptr, 3, US" SNI=\"",
       string_printing(tls_in.sni), US"\"");
 
     s = string_append(s, &size, &ptr, 3, US" SNI=\"",
       string_printing(tls_in.sni), US"\"");
 


@@ -1294,7 +1299,7 @@ smtp_log_no_mail(void)
 int size, ptr, i;
 uschar *s, *sep;
 
 int size, ptr, i;
 uschar *s, *sep;
 

-if (smtp_mailcmd_count > 0 || (log_extra_selector & LX_smtp_no_mail) == 0)
+if (smtp_mailcmd_count > 0 || !LOGGING(smtp_no_mail))

   return;
 
 s = NULL;
   return;
 
 s = NULL;


@@ -1539,7 +1544,7 @@ spf_received = NULL;
 spf_result = NULL;
 spf_smtp_comment = NULL;
 #endif
 spf_result = NULL;
 spf_smtp_comment = NULL;
 #endif

-#ifdef EXPERIMENTAL_INTERNATIONAL
+#ifdef SUPPORT_I18N

 message_smtputf8 = FALSE;
 #endif
 body_linecount = body_zerocount = 0;
 message_smtputf8 = FALSE;
 #endif
 body_linecount = body_zerocount = 0;


@@ -1861,8 +1866,6 @@ pipelining_enable = TRUE;
 sync_cmd_limit = NON_SYNC_CMD_NON_PIPELINING;
 smtp_exit_function_called = FALSE;    /* For avoiding loop in not-quit exit */
 
 sync_cmd_limit = NON_SYNC_CMD_NON_PIPELINING;
 smtp_exit_function_called = FALSE;    /* For avoiding loop in not-quit exit */
 

-memset(sender_host_cache, 0, sizeof(sender_host_cache));
-

 /* If receiving by -bs from a trusted user, or testing with -bh, we allow
 authentication settings from -oMaa to remain in force. */
 
 /* If receiving by -bs from a trusted user, or testing with -bh, we allow
 authentication settings from -oMaa to remain in force. */
 


@@ -1877,7 +1880,7 @@ tls_in.ocsp = OCSP_NOT_REQ;
 tls_advertised = FALSE;
 #endif
 dsn_advertised = FALSE;
 tls_advertised = FALSE;
 #endif
 dsn_advertised = FALSE;

-#ifdef EXPERIMENTAL_INTERNATIONAL
+#ifdef SUPPORT_I18N

 smtputf8_advertised = FALSE;
 #endif
 
 smtputf8_advertised = FALSE;
 #endif
 


@@ -2306,7 +2309,7 @@ if (!sender_host_unknown)
 
 if (smtp_batched_input) return TRUE;
 
 
 if (smtp_batched_input) return TRUE;
 

-#ifdef EXPERIMENTAL_PROXY
+#ifdef SUPPORT_PROXY

 /* If valid Proxy Protocol source is connecting, set up session.
  * Failure will not allow any SMTP function other than QUIT. */
 proxy_session = FALSE;
 /* If valid Proxy Protocol source is connecting, set up session.
  * Failure will not allow any SMTP function other than QUIT. */
 proxy_session = FALSE;


@@ -2350,10 +2353,9 @@ code = US"220";   /* Default status code */
 esc = US"";       /* Default extended status code */
 esclen = 0;       /* Length of esc */
 
 esc = US"";       /* Default extended status code */
 esclen = 0;       /* Length of esc */
 

-if (user_msg == NULL)
+if (!user_msg)

   {
   {

-  s = expand_string(smtp_banner);
-  if (s == NULL)
+  if (!(s = expand_string(smtp_banner)))

     log_write(0, LOG_MAIN|LOG_PANIC_DIE, "Expansion of \"%s\" (smtp_banner) "
       "failed: %s", smtp_banner, expand_string_message);
   }
     log_write(0, LOG_MAIN|LOG_PANIC_DIE, "Expansion of \"%s\" (smtp_banner) "
       "failed: %s", smtp_banner, expand_string_message);
   }


@@ -2361,7 +2363,7 @@ else
   {
   int codelen = 3;
   s = user_msg;
   {
   int codelen = 3;
   s = user_msg;

-  smtp_message_code(&code, &codelen, &s, NULL);
+  smtp_message_code(&code, &codelen, &s, NULL, TRUE);

   if (codelen > 4)
     {
     esc = code + 4;
   if (codelen > 4)
     {
     esc = code + 4;


@@ -2392,20 +2394,20 @@ do       /* At least once, in case we have an empty string */
   {
   int len;
   uschar *linebreak = Ustrchr(p, '\n');
   {
   int len;
   uschar *linebreak = Ustrchr(p, '\n');

-  ss = string_cat(ss, &size, &ptr, code, 3);
+  ss = string_catn(ss, &size, &ptr, code, 3);

   if (linebreak == NULL)
     {
     len = Ustrlen(p);
   if (linebreak == NULL)
     {
     len = Ustrlen(p);

-    ss = string_cat(ss, &size, &ptr, US" ", 1);
+    ss = string_catn(ss, &size, &ptr, US" ", 1);

     }
   else
     {
     len = linebreak - p;
     }
   else
     {
     len = linebreak - p;

-    ss = string_cat(ss, &size, &ptr, US"-", 1);
+    ss = string_catn(ss, &size, &ptr, US"-", 1);

     }
     }

-  ss = string_cat(ss, &size, &ptr, esc, esclen);
-  ss = string_cat(ss, &size, &ptr, p, len);
-  ss = string_cat(ss, &size, &ptr, US"\r\n", 2);
+  ss = string_catn(ss, &size, &ptr, esc, esclen);
+  ss = string_catn(ss, &size, &ptr, p, len);
+  ss = string_catn(ss, &size, &ptr, US"\r\n", 2);

   p += len;
   if (linebreak != NULL) p++;
   }
   p += len;
   if (linebreak != NULL) p++;
   }


@@ -2503,8 +2505,8 @@ static void
 incomplete_transaction_log(uschar *what)
 {
 if (sender_address == NULL ||                 /* No transaction in progress */
 incomplete_transaction_log(uschar *what)
 {
 if (sender_address == NULL ||                 /* No transaction in progress */

-    (log_write_selector & L_smtp_incomplete_transaction) == 0  /* Not logging */
-  ) return;
+    !LOGGING(smtp_incomplete_transaction))
+  return;

 
 /* Build list of recipients for logging */
 
 
 /* Build list of recipients for logging */
 


@@ -2623,23 +2625,24 @@ Arguments:
   codelen       length of smtp code; if > 4 there's an ESC
   msg           message text
   log_msg       optional log message, to be adjusted with the new SMTP code
   codelen       length of smtp code; if > 4 there's an ESC
   msg           message text
   log_msg       optional log message, to be adjusted with the new SMTP code

+  check_valid   if true, verify the response code

 
 Returns:        nothing
 */
 
 void
 
 Returns:        nothing
 */
 
 void

-smtp_message_code(uschar **code, int *codelen, uschar **msg, uschar **log_msg)
+smtp_message_code(uschar **code, int *codelen, uschar **msg, uschar **log_msg,
+  BOOL check_valid)

 {
 int n;
 int ovector[3];
 
 {
 int n;
 int ovector[3];
 

-if (msg == NULL || *msg == NULL) return;
+if (!msg || !*msg) return;

 
 

-n = pcre_exec(regex_smtp_code, NULL, CS *msg, Ustrlen(*msg), 0,
-  PCRE_EOPT, ovector, sizeof(ovector)/sizeof(int));
-if (n < 0) return;
+if ((n = pcre_exec(regex_smtp_code, NULL, CS *msg, Ustrlen(*msg), 0,
+  PCRE_EOPT, ovector, sizeof(ovector)/sizeof(int))) < 0) return;

 
 

-if ((*msg)[0] != (*code)[0])
+if (check_valid && (*msg)[0] != (*code)[0])

   {
   log_write(0, LOG_MAIN|LOG_PANIC, "configured error code starts with "
     "incorrect digit (expected %c) in \"%s\"", (*code)[0], *msg);
   {
   log_write(0, LOG_MAIN|LOG_PANIC, "configured error code starts with "
     "incorrect digit (expected %c) in \"%s\"", (*code)[0], *msg);


@@ -2674,18 +2677,19 @@ defaults disabled in Exim. However, discussion in connection with RFC 821bis
 (aka RFC 2821) has concluded that the response should be 252 in the disabled
 state, because there are broken clients that try VRFY before RCPT. A 5xx
 response should be given only when the address is positively known to be
 (aka RFC 2821) has concluded that the response should be 252 in the disabled
 state, because there are broken clients that try VRFY before RCPT. A 5xx
 response should be given only when the address is positively known to be

-undeliverable. Sigh. Also, for ETRN, 458 is given on refusal, and for AUTH,
-503.
+undeliverable. Sigh. We return 252 if there is no VRFY ACL or it provides
+no explicit code, but if there is one we let it know best.
+Also, for ETRN, 458 is given on refusal, and for AUTH, 503.

 
 From Exim 4.63, it is possible to override the response code details by
 providing a suitable response code string at the start of the message provided
 in user_msg. The code's first digit is checked for validity.
 
 Arguments:
 
 From Exim 4.63, it is possible to override the response code details by
 providing a suitable response code string at the start of the message provided
 in user_msg. The code's first digit is checked for validity.
 
 Arguments:

-  where      where the ACL was called from
-  rc         the failure code
-  user_msg   a message that can be included in an SMTP response
-  log_msg    a message for logging
+  where        where the ACL was called from
+  rc           the failure code
+  user_msg     a message that can be included in an SMTP response
+  log_msg      a message for logging

 
 Returns:     0 in most cases
              2 if the failure code was FAIL_DROP, in which case the
 
 Returns:     0 in most cases
              2 if the failure code was FAIL_DROP, in which case the


@@ -2718,8 +2722,9 @@ if (drop) rc = FAIL;
 
 /* Set the default SMTP code, and allow a user message to change it. */
 
 
 /* Set the default SMTP code, and allow a user message to change it. */
 

-smtp_code = (rc != FAIL)? US"451" : acl_wherecodes[where];
-smtp_message_code(&smtp_code, &codelen, &user_msg, &log_msg);
+smtp_code = rc == FAIL ? acl_wherecodes[where] : US"451";
+smtp_message_code(&smtp_code, &codelen, &user_msg, &log_msg,
+  where != ACL_WHERE_VRFY);

 
 /* We used to have sender_address here; however, there was a bug that was not
 updating sender_address after a rewrite during a verify. When this bug was
 
 /* We used to have sender_address here; however, there was a bug that was not
 updating sender_address after a rewrite during a verify. When this bug was


@@ -2755,7 +2760,7 @@ if (sender_verified_failed != NULL &&
 
   setflag(sender_verified_failed, af_sverify_told);
 
 
   setflag(sender_verified_failed, af_sverify_told);
 

-  if (rc != FAIL || (log_extra_selector & LX_sender_verify_fail) != 0)
+  if (rc != FAIL || LOGGING(sender_verify_fail))

     log_write(0, LOG_MAIN|LOG_REJECT, "%s sender verify %s for <%s>%s",
       host_and_ident(TRUE),
       ((sender_verified_failed->special_action & 255) == DEFER)? "defer":"fail",
     log_write(0, LOG_MAIN|LOG_REJECT, "%s sender verify %s for <%s>%s",
       host_and_ident(TRUE),
       ((sender_verified_failed->special_action & 255) == DEFER)? "defer":"fail",


@@ -3093,7 +3098,7 @@ static void
 smtp_user_msg(uschar *code, uschar *user_msg)
 {
 int len = 3;
 smtp_user_msg(uschar *code, uschar *user_msg)
 {
 int len = 3;

-smtp_message_code(&code, &len, &user_msg, NULL);
+smtp_message_code(&code, &len, &user_msg, NULL, TRUE);

 smtp_respond(code, len, TRUE, user_msg);
 }
 
 smtp_respond(code, len, TRUE, user_msg);
 }
 


@@ -3288,7 +3293,7 @@ while (done <= 0)
   pid_t pid;
   int start, end, sender_domain, recipient_domain;
   int ptr, size, rc;
   pid_t pid;
   int start, end, sender_domain, recipient_domain;
   int ptr, size, rc;

-  int c, i;
+  int c;

   auth_instance *au;
   uschar *orcpt = NULL;
   int flags;
   auth_instance *au;
   uschar *orcpt = NULL;
   int flags;


@@ -3302,14 +3307,13 @@ while (done <= 0)
      )
     {
     cmd_list[CMD_LIST_TLS_AUTH].is_mail_cmd = FALSE;
      )
     {
     cmd_list[CMD_LIST_TLS_AUTH].is_mail_cmd = FALSE;

-    if (acl_smtp_auth)
+    if (  acl_smtp_auth
+       && (rc = acl_check(ACL_WHERE_AUTH, NULL, acl_smtp_auth,
+                 &user_msg, &log_msg)) != OK
+       )

       {
       {

-      rc = acl_check(ACL_WHERE_AUTH, NULL, acl_smtp_auth, &user_msg, &log_msg);
-      if (rc != OK)
-        {
-        done = smtp_handle_acl_fail(ACL_WHERE_AUTH, rc, user_msg, log_msg);
-        continue;
-        }
+      done = smtp_handle_acl_fail(ACL_WHERE_AUTH, rc, user_msg, log_msg);
+      continue;

       }
 
     for (au = auths; au; au = au->next)
       }
 
     for (au = auths; au; au = au->next)


@@ -3317,12 +3321,10 @@ while (done <= 0)
        {
        smtp_cmd_data = NULL;
 
        {
        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);
+       if (smtp_in_auth(au, &s, &ss) == OK)
+         { DEBUG(D_auth) debug_printf("tls auth succeeded\n"); }

        else
        else

-         DEBUG(D_auth) debug_printf("tls auth succeeded\n");
-
+         { DEBUG(D_auth) debug_printf("tls auth not succeeded\n"); }

        break;
        }
     }
        break;
        }
     }


@@ -3370,14 +3372,13 @@ while (done <= 0)
 
     /* Check the ACL */
 
 
     /* Check the ACL */
 

-    if (acl_smtp_auth)
+    if (  acl_smtp_auth
+       && (rc = acl_check(ACL_WHERE_AUTH, NULL, acl_smtp_auth,
+                 &user_msg, &log_msg)) != OK
+       )

       {
       {

-      rc = acl_check(ACL_WHERE_AUTH, NULL, acl_smtp_auth, &user_msg, &log_msg);
-      if (rc != OK)
-        {
-        done = smtp_handle_acl_fail(ACL_WHERE_AUTH, rc, user_msg, log_msg);
-        break;
-        }
+      done = smtp_handle_acl_fail(ACL_WHERE_AUTH, rc, user_msg, log_msg);
+      break;

       }
 
     /* Find the name of the requested authentication mechanism. */
       }
 
     /* Find the name of the requested authentication mechanism. */


@@ -3549,10 +3550,9 @@ while (done <= 0)
     /* Apply an ACL check if one is defined; afterwards, recheck
     synchronization in case the client started sending in a delay. */
 
     /* Apply an ACL check if one is defined; afterwards, recheck
     synchronization in case the client started sending in a delay. */
 

-    if (acl_smtp_helo != NULL)
-      {
-      rc = acl_check(ACL_WHERE_HELO, NULL, acl_smtp_helo, &user_msg, &log_msg);
-      if (rc != OK)
+    if (acl_smtp_helo)
+      if ((rc = acl_check(ACL_WHERE_HELO, NULL, acl_smtp_helo,
+               &user_msg, &log_msg)) != OK)

         {
         done = smtp_handle_acl_fail(ACL_WHERE_HELO, rc, user_msg, log_msg);
         sender_helo_name = NULL;
         {
         done = smtp_handle_acl_fail(ACL_WHERE_HELO, rc, user_msg, log_msg);
         sender_helo_name = NULL;


@@ -3560,7 +3560,6 @@ while (done <= 0)
         break;
         }
       else if (!check_sync()) goto SYNC_FAILURE;
         break;
         }
       else if (!check_sync()) goto SYNC_FAILURE;

-      }

 
     /* Generate an OK reply. The default string includes the ident if present,
     and also the IP address if present. Reflecting back the ident is intended
 
     /* Generate an OK reply. The default string includes the ident if present,
     and also the IP address if present. Reflecting back the ident is intended


@@ -3574,7 +3573,7 @@ while (done <= 0)
     tls_advertised = FALSE;
 #endif
     dsn_advertised = FALSE;
     tls_advertised = FALSE;
 #endif
     dsn_advertised = FALSE;

-#ifdef EXPERIMENTAL_INTERNATIONAL
+#ifdef SUPPORT_I18N

     smtputf8_advertised = FALSE;
 #endif
 
     smtputf8_advertised = FALSE;
 #endif
 


@@ -3593,10 +3592,9 @@ while (done <= 0)
 
       if (sender_host_address != NULL)
         {
 
       if (sender_host_address != NULL)
         {

-        s = string_cat(s, &size, &ptr, US" [", 2);
-        s = string_cat(s, &size, &ptr, sender_host_address,
-          Ustrlen(sender_host_address));
-        s = string_cat(s, &size, &ptr, US"]", 1);
+        s = string_catn(s, &size, &ptr, US" [", 2);
+        s = string_cat (s, &size, &ptr, sender_host_address);
+        s = string_catn(s, &size, &ptr, US"]", 1);

         }
       }
 
         }
       }
 


@@ -3608,7 +3606,7 @@ while (done <= 0)
       {
       char *ss;
       int codelen = 4;
       {
       char *ss;
       int codelen = 4;

-      smtp_message_code(&smtp_code, &codelen, &user_msg, NULL);
+      smtp_message_code(&smtp_code, &codelen, &user_msg, NULL, TRUE);

       s = string_sprintf("%.*s%s", codelen, smtp_code, user_msg);
       if ((ss = strpbrk(CS s, "\r\n")) != NULL)
         {
       s = string_sprintf("%.*s%s", codelen, smtp_code, user_msg);
       if ((ss = strpbrk(CS s, "\r\n")) != NULL)
         {


@@ -3620,7 +3618,7 @@ while (done <= 0)
       size = ptr + 1;
       }
 
       size = ptr + 1;
       }
 

-    s = string_cat(s, &size, &ptr, US"\r\n", 2);
+    s = string_catn(s, &size, &ptr, US"\r\n", 2);

 
     /* If we received EHLO, we must create a multiline response which includes
     the functions supported. */
 
     /* If we received EHLO, we must create a multiline response which includes
     the functions supported. */


@@ -3639,12 +3637,12 @@ while (done <= 0)
         {
         sprintf(CS big_buffer, "%.3s-SIZE %d\r\n", smtp_code,
           thismessage_size_limit);
         {
         sprintf(CS big_buffer, "%.3s-SIZE %d\r\n", smtp_code,
           thismessage_size_limit);

-        s = string_cat(s, &size, &ptr, big_buffer, Ustrlen(big_buffer));
+        s = string_cat(s, &size, &ptr, big_buffer);

         }
       else
         {
         }
       else
         {

-        s = string_cat(s, &size, &ptr, smtp_code, 3);
-        s = string_cat(s, &size, &ptr, US"-SIZE\r\n", 7);
+        s = string_catn(s, &size, &ptr, smtp_code, 3);
+        s = string_catn(s, &size, &ptr, US"-SIZE\r\n", 7);

         }
 
       /* Exim does not do protocol conversion or data conversion. It is 8-bit
         }
 
       /* Exim does not do protocol conversion or data conversion. It is 8-bit


@@ -3656,15 +3654,15 @@ while (done <= 0)
 
       if (accept_8bitmime)
         {
 
       if (accept_8bitmime)
         {

-        s = string_cat(s, &size, &ptr, smtp_code, 3);
-        s = string_cat(s, &size, &ptr, US"-8BITMIME\r\n", 11);
+        s = string_catn(s, &size, &ptr, smtp_code, 3);
+        s = string_catn(s, &size, &ptr, US"-8BITMIME\r\n", 11);

         }
 
       /* Advertise DSN support if configured to do so. */
         }
 
       /* Advertise DSN support if configured to do so. */

-      if (verify_check_host(&dsn_advertise_hosts) != FAIL) 
+      if (verify_check_host(&dsn_advertise_hosts) != FAIL)

         {
         {

-        s = string_cat(s, &size, &ptr, smtp_code, 3);
-        s = string_cat(s, &size, &ptr, US"-DSN\r\n", 6);
+        s = string_catn(s, &size, &ptr, smtp_code, 3);
+        s = string_catn(s, &size, &ptr, US"-DSN\r\n", 6);

         dsn_advertised = TRUE;
         }
 
         dsn_advertised = TRUE;
         }
 


@@ -3673,8 +3671,8 @@ while (done <= 0)
 
       if (acl_smtp_etrn != NULL)
         {
 
       if (acl_smtp_etrn != NULL)
         {

-        s = string_cat(s, &size, &ptr, smtp_code, 3);
-        s = string_cat(s, &size, &ptr, US"-ETRN\r\n", 7);
+        s = string_catn(s, &size, &ptr, smtp_code, 3);
+        s = string_catn(s, &size, &ptr, US"-ETRN\r\n", 7);

         }
 
       /* Advertise EXPN if there's an ACL checking whether a host is
         }
 
       /* Advertise EXPN if there's an ACL checking whether a host is


@@ -3682,8 +3680,8 @@ while (done <= 0)
 
       if (acl_smtp_expn != NULL)
         {
 
       if (acl_smtp_expn != NULL)
         {

-        s = string_cat(s, &size, &ptr, smtp_code, 3);
-        s = string_cat(s, &size, &ptr, US"-EXPN\r\n", 7);
+        s = string_catn(s, &size, &ptr, smtp_code, 3);
+        s = string_catn(s, &size, &ptr, US"-EXPN\r\n", 7);

         }
 
       /* Exim is quite happy with pipelining, so let the other end know that
         }
 
       /* Exim is quite happy with pipelining, so let the other end know that


@@ -3692,8 +3690,8 @@ while (done <= 0)
       if (pipelining_enable &&
           verify_check_host(&pipelining_advertise_hosts) == OK)
         {
       if (pipelining_enable &&
           verify_check_host(&pipelining_advertise_hosts) == OK)
         {

-        s = string_cat(s, &size, &ptr, smtp_code, 3);
-        s = string_cat(s, &size, &ptr, US"-PIPELINING\r\n", 13);
+        s = string_catn(s, &size, &ptr, smtp_code, 3);
+        s = string_catn(s, &size, &ptr, US"-PIPELINING\r\n", 13);

         sync_cmd_limit = NON_SYNC_CMD_PIPELINING;
         pipelining_advertised = TRUE;
         }
         sync_cmd_limit = NON_SYNC_CMD_PIPELINING;
         pipelining_advertised = TRUE;
         }


@@ -3726,22 +3724,21 @@ while (done <= 0)
            int saveptr;
            if (first)
              {
            int saveptr;
            if (first)
              {

-             s = string_cat(s, &size, &ptr, smtp_code, 3);
-             s = string_cat(s, &size, &ptr, US"-AUTH", 5);
+             s = string_catn(s, &size, &ptr, smtp_code, 3);
+             s = string_catn(s, &size, &ptr, US"-AUTH", 5);

              first = FALSE;
              auth_advertised = TRUE;
              }
            saveptr = ptr;
              first = FALSE;
              auth_advertised = TRUE;
              }
            saveptr = ptr;

-           s = string_cat(s, &size, &ptr, US" ", 1);
-           s = string_cat(s, &size, &ptr, au->public_name,
-             Ustrlen(au->public_name));
+           s = string_catn(s, &size, &ptr, US" ", 1);
+           s = string_cat (s, &size, &ptr, au->public_name);

            while (++saveptr < ptr) s[saveptr] = toupper(s[saveptr]);
            au->advertised = TRUE;
            }
          else
            au->advertised = FALSE;
 
            while (++saveptr < ptr) s[saveptr] = toupper(s[saveptr]);
            au->advertised = TRUE;
            }
          else
            au->advertised = FALSE;
 

-       if (!first) s = string_cat(s, &size, &ptr, US"\r\n", 2);
+       if (!first) s = string_catn(s, &size, &ptr, US"\r\n", 2);

        }
 
       /* Advertise TLS (Transport Level Security) aka SSL (Secure Socket Layer)
        }
 
       /* Advertise TLS (Transport Level Security) aka SSL (Secure Socket Layer)


@@ -3753,8 +3750,8 @@ while (done <= 0)
       if (tls_in.active < 0 &&
           verify_check_host(&tls_advertise_hosts) != FAIL)
         {
       if (tls_in.active < 0 &&
           verify_check_host(&tls_advertise_hosts) != FAIL)
         {

-        s = string_cat(s, &size, &ptr, smtp_code, 3);
-        s = string_cat(s, &size, &ptr, US"-STARTTLS\r\n", 11);
+        s = string_catn(s, &size, &ptr, smtp_code, 3);
+        s = string_catn(s, &size, &ptr, US"-STARTTLS\r\n", 11);

         tls_advertised = TRUE;
         }
 #endif
         tls_advertised = TRUE;
         }
 #endif


@@ -3763,25 +3760,25 @@ while (done <= 0)
       /* Per Recipient Data Response, draft by Eric A. Hall extending RFC */
       if (prdr_enable)
         {
       /* Per Recipient Data Response, draft by Eric A. Hall extending RFC */
       if (prdr_enable)
         {

-        s = string_cat(s, &size, &ptr, smtp_code, 3);
-        s = string_cat(s, &size, &ptr, US"-PRDR\r\n", 7);
+        s = string_catn(s, &size, &ptr, smtp_code, 3);
+        s = string_catn(s, &size, &ptr, US"-PRDR\r\n", 7);

        }
 #endif
 
        }
 #endif
 

-#ifdef EXPERIMENTAL_INTERNATIONAL
+#ifdef SUPPORT_I18N

       if (  accept_8bitmime
          && verify_check_host(&smtputf8_advertise_hosts) != FAIL)
        {
       if (  accept_8bitmime
          && verify_check_host(&smtputf8_advertise_hosts) != FAIL)
        {

-        s = string_cat(s, &size, &ptr, smtp_code, 3);
-        s = string_cat(s, &size, &ptr, US"-SMTPUTF8\r\n", 11);
+        s = string_catn(s, &size, &ptr, smtp_code, 3);
+        s = string_catn(s, &size, &ptr, US"-SMTPUTF8\r\n", 11);

         smtputf8_advertised = TRUE;
        }
 #endif
 
       /* Finish off the multiline reply with one that is always available. */
 
         smtputf8_advertised = TRUE;
        }
 #endif
 
       /* Finish off the multiline reply with one that is always available. */
 

-      s = string_cat(s, &size, &ptr, smtp_code, 3);
-      s = string_cat(s, &size, &ptr, US" HELP\r\n", 7);
+      s = string_catn(s, &size, &ptr, smtp_code, 3);
+      s = string_catn(s, &size, &ptr, US" HELP\r\n", 7);

       }
 
     /* Terminate the string (for debug), write it, and note that HELO/EHLO
       }
 
     /* Terminate the string (for debug), write it, and note that HELO/EHLO


@@ -3882,7 +3879,7 @@ while (done <= 0)
       if (!extract_option(&name, &value)) break;
 
       for (mail_args = env_mail_type_list;
       if (!extract_option(&name, &value)) break;
 
       for (mail_args = env_mail_type_list;

-           (char *)mail_args < (char *)env_mail_type_list + sizeof(env_mail_type_list);
+           mail_args->value != ENV_MAIL_OPT_NULL;

            mail_args++
           )
         if (strcmpic(name, mail_args->name) == 0)
            mail_args++
           )
         if (strcmpic(name, mail_args->name) == 0)


@@ -4008,7 +4005,7 @@ while (done <= 0)
               rc = acl_check(ACL_WHERE_MAILAUTH, NULL, acl_smtp_mailauth,
                 &user_msg, &log_msg);
               }
               rc = acl_check(ACL_WHERE_MAILAUTH, NULL, acl_smtp_mailauth,
                 &user_msg, &log_msg);
               }

-  
+

             switch (rc)
               {
               case OK:
             switch (rc)
               {
               case OK:


@@ -4017,23 +4014,23 @@ while (done <= 0)
                    expand_check_condition(authenticated_by->mail_auth_condition,
                        authenticated_by->name, US"authenticator"))
                  break;     /* Accept the AUTH */
                    expand_check_condition(authenticated_by->mail_auth_condition,
                        authenticated_by->name, US"authenticator"))
                  break;     /* Accept the AUTH */

-    
+

                ignore_msg = US"server_mail_auth_condition failed";
                if (authenticated_id != NULL)
                  ignore_msg = string_sprintf("%s: authenticated ID=\"%s\"",
                    ignore_msg, authenticated_id);
                ignore_msg = US"server_mail_auth_condition failed";
                if (authenticated_id != NULL)
                  ignore_msg = string_sprintf("%s: authenticated ID=\"%s\"",
                    ignore_msg, authenticated_id);

-  
+

               /* Fall through */
               /* Fall through */

-  
+

               case FAIL:
                authenticated_sender = NULL;
                log_write(0, LOG_MAIN, "ignoring AUTH=%s from %s (%s)",
                  value, host_and_ident(TRUE), ignore_msg);
                break;
               case FAIL:
                authenticated_sender = NULL;
                log_write(0, LOG_MAIN, "ignoring AUTH=%s from %s (%s)",
                  value, host_and_ident(TRUE), ignore_msg);
                break;

-  
+

               /* Should only get DEFER or ERROR here. Put back terminator
               overrides for error message */
               /* Should only get DEFER or ERROR here. Put back terminator
               overrides for error message */

-  
+

               default:
                value[-1] = '=';
                name[-1] = ' ';
               default:
                value[-1] = '=';
                name[-1] = ' ';


@@ -4051,7 +4048,7 @@ while (done <= 0)
           break;
 #endif
 
           break;
 #endif
 

-#ifdef EXPERIMENTAL_INTERNATIONAL
+#ifdef SUPPORT_I18N

         case ENV_MAIL_OPT_UTF8:
          if (smtputf8_advertised)
            {
         case ENV_MAIL_OPT_UTF8:
          if (smtputf8_advertised)
            {


@@ -4061,15 +4058,17 @@ while (done <= 0)
            }
          break;
 #endif
            }
          break;
 #endif

-        /* Unknown option. Stick back the terminator characters and break
+        /* No valid option. Stick back the terminator characters and break

         the loop.  Do the name-terminator second as extract_option sets
         the loop.  Do the name-terminator second as extract_option sets

-       value==name when it found no equal-sign.
-       An error for a malformed address will occur. */
-        default:
+        value==name when it found no equal-sign.
+        An error for a malformed address will occur. */
+        case ENV_MAIL_OPT_NULL:

           value[-1] = '=';
           name[-1] = ' ';
           arg_error = TRUE;
           break;
           value[-1] = '=';
           name[-1] = ' ';
           arg_error = TRUE;
           break;

+
+        default:  assert(0);

         }
       /* Break out of for loop if switch() had bad argument or
          when start of the email address is reached */
         }
       /* Break out of for loop if switch() had bad argument or
          when start of the email address is reached */


@@ -4201,7 +4200,7 @@ while (done <= 0)
                     US"",
                   #endif
                     US"\r\n");
                     US"",
                   #endif
                     US"\r\n");

-      else 
+      else

         {
       #ifndef DISABLE_PRDR
         if (prdr_requested)
         {
       #ifndef DISABLE_PRDR
         if (prdr_requested)


@@ -4459,7 +4458,7 @@ while (done <= 0)
       if (user_msg == NULL) smtp_printf("250 Accepted\r\n");
         else smtp_user_msg(US"250", user_msg);
       receive_add_recipient(recipient, -1);
       if (user_msg == NULL) smtp_printf("250 Accepted\r\n");
         else smtp_user_msg(US"250", user_msg);
       receive_add_recipient(recipient, -1);

- 
+

       /* Set the dsn flags in the recipients_list */
       recipients_list[recipients_count-1].orcpt = orcpt;
       recipients_list[recipients_count-1].dsn_flags = flags;
       /* Set the dsn flags in the recipients_list */
       recipients_list[recipients_count-1].orcpt = orcpt;
       recipients_list[recipients_count-1].dsn_flags = flags;


@@ -4578,51 +4577,49 @@ while (done <= 0)
 
 
     case VRFY_CMD:
 
 
     case VRFY_CMD:

-    HAD(SCH_VRFY);
-    rc = acl_check(ACL_WHERE_VRFY, NULL, acl_smtp_vrfy, &user_msg, &log_msg);
-    if (rc != OK)
-      done = smtp_handle_acl_fail(ACL_WHERE_VRFY, rc, user_msg, log_msg);
-    else

       {
       {

-      uschar *address;
-      uschar *s = NULL;
+      uschar * address;
+
+      HAD(SCH_VRFY);

 
 

-      /* rfc821_domains = TRUE; << no longer needed */
-      address = parse_extract_address(smtp_cmd_data, &errmess, &start, &end,
-        &recipient_domain, FALSE);
-      /* rfc821_domains = FALSE; << no longer needed */
+      if(!(address = parse_extract_address(smtp_cmd_data, &errmess, &start, &end,
+           &recipient_domain, FALSE)))
+       smtp_printf("501 %s\r\n", errmess);

 
 

-      if (address == NULL)
-        s = string_sprintf("501 %s", errmess);
+      else if ((rc = acl_check(ACL_WHERE_VRFY, address, acl_smtp_vrfy,
+                   &user_msg, &log_msg)) != OK)
+       done = smtp_handle_acl_fail(ACL_WHERE_VRFY, rc, user_msg, log_msg);

       else
       else

-        {
-        address_item *addr = deliver_make_addr(address, FALSE);
-        switch(verify_address(addr, NULL, vopt_is_recipient | vopt_qualify, -1,
-               -1, -1, NULL, NULL, NULL))
-          {
-          case OK:
-          s = string_sprintf("250 <%s> is deliverable", address);
-          break;
+       {
+       uschar *s = NULL;

 
 

-          case DEFER:
-          s = (addr->user_message != NULL)?
-            string_sprintf("451 <%s> %s", address, addr->user_message) :
-            string_sprintf("451 Cannot resolve <%s> at this time", address);
-          break;
+       address_item *addr = deliver_make_addr(address, FALSE);
+       switch(verify_address(addr, NULL, vopt_is_recipient | vopt_qualify, -1,
+              -1, -1, NULL, NULL, NULL))
+         {
+         case OK:
+           s = string_sprintf("250 <%s> is deliverable", address);
+           break;

 
 

-          case FAIL:
-          s = (addr->user_message != NULL)?
-            string_sprintf("550 <%s> %s", address, addr->user_message) :
-            string_sprintf("550 <%s> is not deliverable", address);
-          log_write(0, LOG_MAIN, "VRFY failed for %s %s",
-            smtp_cmd_argument, host_and_ident(TRUE));
-          break;
-          }
-        }
+         case DEFER:
+           s = (addr->user_message != NULL)?
+             string_sprintf("451 <%s> %s", address, addr->user_message) :
+             string_sprintf("451 Cannot resolve <%s> at this time", address);
+           break;

 
 

-      smtp_printf("%s\r\n", s);
+         case FAIL:
+           s = (addr->user_message != NULL)?
+             string_sprintf("550 <%s> %s", address, addr->user_message) :
+             string_sprintf("550 <%s> is not deliverable", address);
+           log_write(0, LOG_MAIN, "VRFY failed for %s %s",
+             smtp_cmd_argument, host_and_ident(TRUE));
+           break;
+         }
+
+       smtp_printf("%s\r\n", s);
+       }
+      break;

       }
       }

-    break;

 
 
     case EXPN_CMD:
 
 
     case EXPN_CMD:


@@ -4656,15 +4653,13 @@ while (done <= 0)
 
     /* Apply an ACL check if one is defined */
 
 
     /* Apply an ACL check if one is defined */
 

-    if (acl_smtp_starttls != NULL)
+    if (  acl_smtp_starttls
+       && (rc = acl_check(ACL_WHERE_STARTTLS, NULL, acl_smtp_starttls,
+                 &user_msg, &log_msg)) != OK
+       )

       {
       {

-      rc = acl_check(ACL_WHERE_STARTTLS, NULL, acl_smtp_starttls, &user_msg,
-        &log_msg);
-      if (rc != OK)
-        {
-        done = smtp_handle_acl_fail(ACL_WHERE_STARTTLS, rc, user_msg, log_msg);
-        break;
-        }
+      done = smtp_handle_acl_fail(ACL_WHERE_STARTTLS, rc, user_msg, log_msg);
+      break;

       }
 
     /* RFC 2487 is not clear on when this command may be sent, though it
       }
 
     /* RFC 2487 is not clear on when this command may be sent, though it


@@ -4907,8 +4902,8 @@ while (done <= 0)
     log_write(L_etrn, LOG_MAIN, "ETRN %s received from %s", smtp_cmd_argument,
       host_and_ident(FALSE));
 
     log_write(L_etrn, LOG_MAIN, "ETRN %s received from %s", smtp_cmd_argument,
       host_and_ident(FALSE));
 

-    rc = acl_check(ACL_WHERE_ETRN, NULL, acl_smtp_etrn, &user_msg, &log_msg);
-    if (rc != OK)
+    if ((rc = acl_check(ACL_WHERE_ETRN, NULL, acl_smtp_etrn,
+               &user_msg, &log_msg)) != OK)

       {
       done = smtp_handle_acl_fail(ACL_WHERE_ETRN, rc, user_msg, log_msg);
       break;
       {
       done = smtp_handle_acl_fail(ACL_WHERE_ETRN, rc, user_msg, log_msg);
       break;


@@ -4974,7 +4969,7 @@ while (done <= 0)
     /* If ETRN queue runs are to be serialized, check the database to
     ensure one isn't already running. */
 
     /* 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;
       {
       smtp_printf("458 Already processing %s\r\n", smtp_cmd_data);
       break;


@@ -5098,11 +5093,11 @@ while (done <= 0)
     done = 1;   /* Pretend eof - drops connection */
     break;
 
     done = 1;   /* Pretend eof - drops connection */
     break;
 

-    #ifdef EXPERIMENTAL_PROXY
+#ifdef SUPPORT_PROXY

     case PROXY_FAIL_IGNORE_CMD:
     smtp_printf("503 Command refused, required Proxy negotiation failed\r\n");
     break;
     case PROXY_FAIL_IGNORE_CMD:
     smtp_printf("503 Command refused, required Proxy negotiation failed\r\n");
     break;

-    #endif
+#endif

 
     default:
     if (unknown_command_count++ >= smtp_max_unknown_commands)
 
     default:
     if (unknown_command_count++ >= smtp_max_unknown_commands)