Testsuite: ignore TCP Fast Open probe debug output

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

diff --git a/src/src/acl.c b/src/src/acl.c
index 5e3bacfe0e82786ee4cf1031e4b95d13c8642d90..6cce0aae66b74c986c9cb01e37144f2747abca25 100644 (file)
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

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

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Code for handling Access Control Lists (ACLs) */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Code for handling Access Control Lists (ACLs) */


@@ -22,13 +22,14 @@ enum { ACL_ACCEPT, ACL_DEFER, ACL_DENY, ACL_DISCARD, ACL_DROP, ACL_REQUIRE,
 /* ACL verbs */
 
 static uschar *verbs[] = {
 /* ACL verbs */
 
 static uschar *verbs[] = {

-    US"accept",
-    US"defer",
-    US"deny",
-    US"discard",
-    US"drop",
-    US"require",
-    US"warn" };
+    [ACL_ACCEPT] =     US"accept",
+    [ACL_DEFER] =      US"defer",
+    [ACL_DENY] =       US"deny",
+    [ACL_DISCARD] =    US"discard",
+    [ACL_DROP] =       US"drop",
+    [ACL_REQUIRE] =    US"require",
+    [ACL_WARN] =       US"warn"
+};

 
 /* For each verb, the conditions for which "message" or "log_message" are used
 are held as a bitmap. This is to avoid expanding the strings unnecessarily. For
 
 /* For each verb, the conditions for which "message" or "log_message" are used
 are held as a bitmap. This is to avoid expanding the strings unnecessarily. For


@@ -36,17 +37,17 @@ are held as a bitmap. This is to avoid expanding the strings unnecessarily. For
 the code. */
 
 static int msgcond[] = {
 the code. */
 
 static int msgcond[] = {

-  (1<<OK) | (1<<FAIL) | (1<<FAIL_DROP),  /* accept */
-  (1<<OK),                               /* defer */
-  (1<<OK),                               /* deny */
-  (1<<OK) | (1<<FAIL) | (1<<FAIL_DROP),  /* discard */
-  (1<<OK),                               /* drop */
-  (1<<FAIL) | (1<<FAIL_DROP),            /* require */
-  (1<<OK)                                /* warn */
+  [ACL_ACCEPT] =       BIT(OK) | BIT(FAIL) | BIT(FAIL_DROP),
+  [ACL_DEFER] =                BIT(OK),
+  [ACL_DENY] =         BIT(OK),
+  [ACL_DISCARD] =      BIT(OK) | BIT(FAIL) | BIT(FAIL_DROP),
+  [ACL_DROP] =         BIT(OK),
+  [ACL_REQUIRE] =      BIT(FAIL) | BIT(FAIL_DROP),
+  [ACL_WARN] =         BIT(OK)

   };
 
 /* ACL condition and modifier codes - keep in step with the table that
   };
 
 /* ACL condition and modifier codes - keep in step with the table that

-follows, and the cond_expand_at_top and uschar cond_modifiers tables lower
+follows.

 down. */
 
 enum { ACLC_ACL,
 down. */
 
 enum { ACLC_ACL,


@@ -88,6 +89,7 @@ enum { ACLC_ACL,
 #ifdef WITH_CONTENT_SCAN
        ACLC_MIME_REGEX,
 #endif
 #ifdef WITH_CONTENT_SCAN
        ACLC_MIME_REGEX,
 #endif

+       ACLC_QUEUE,

        ACLC_RATELIMIT,
        ACLC_RECIPIENTS,
 #ifdef WITH_CONTENT_SCAN
        ACLC_RATELIMIT,
        ACLC_RECIPIENTS,
 #ifdef WITH_CONTENT_SCAN


@@ -100,7 +102,7 @@ enum { ACLC_ACL,
 #ifdef WITH_CONTENT_SCAN
        ACLC_SPAM,
 #endif
 #ifdef WITH_CONTENT_SCAN
        ACLC_SPAM,
 #endif

-#ifdef EXPERIMENTAL_SPF
+#ifdef SUPPORT_SPF

        ACLC_SPF,
        ACLC_SPF_GUESS,
 #endif
        ACLC_SPF,
        ACLC_SPF_GUESS,
 #endif


@@ -108,76 +110,238 @@ enum { ACLC_ACL,
        ACLC_VERIFY };
 
 /* ACL conditions/modifiers: "delay", "control", "continue", "endpass",
        ACLC_VERIFY };
 
 /* ACL conditions/modifiers: "delay", "control", "continue", "endpass",

-"message", "log_message", "log_reject_target", "logwrite", and "set" are
+"message", "log_message", "log_reject_target", "logwrite", "queue" and "set" are

 modifiers that look like conditions but always return TRUE. They are used for
 their side effects. */
 
 modifiers that look like conditions but always return TRUE. They are used for
 their side effects. */
 

-static uschar *conditions[] = {
-  US"acl",
-  US"add_header",
-  US"authenticated",
+typedef struct condition_def {
+  uschar       *name;
+
+/* Flag to indicate the condition/modifier has a string expansion done
+at the outer level. In the other cases, expansion already occurs in the
+checking functions. */
+  BOOL         expand_at_top:1;
+
+  BOOL         is_modifier:1;
+
+/* Bit map vector of which conditions and modifiers are not allowed at certain
+times. For each condition and modifier, there's a bitmap of dis-allowed times.
+For some, it is easier to specify the negation of a small number of allowed
+times. */
+  unsigned     forbids;
+
+} condition_def;
+
+static condition_def conditions[] = {
+  [ACLC_ACL] =                 { US"acl",              FALSE, FALSE,   0 },
+
+  [ACLC_ADD_HEADER] =          { US"add_header",       TRUE, TRUE,
+                                 (unsigned int)
+                                 ~(ACL_BIT_MAIL | ACL_BIT_RCPT |
+                                   ACL_BIT_PREDATA | ACL_BIT_DATA |
+#ifndef DISABLE_PRDR
+                                   ACL_BIT_PRDR |
+#endif
+                                   ACL_BIT_MIME | ACL_BIT_NOTSMTP |
+                                   ACL_BIT_DKIM |
+                                   ACL_BIT_NOTSMTP_START),
+  },
+
+  [ACLC_AUTHENTICATED] =       { US"authenticated",    FALSE, FALSE,
+                                 ACL_BIT_NOTSMTP | ACL_BIT_NOTSMTP_START |
+                                   ACL_BIT_CONNECT | ACL_BIT_HELO,
+  },

 #ifdef EXPERIMENTAL_BRIGHTMAIL
 #ifdef EXPERIMENTAL_BRIGHTMAIL

-  US"bmi_optin",
+  [ACLC_BMI_OPTIN] =           { US"bmi_optin",        TRUE, TRUE,
+                                 ACL_BIT_AUTH |
+                                   ACL_BIT_CONNECT | ACL_BIT_HELO |
+                                   ACL_BIT_DATA | ACL_BIT_MIME |
+# ifndef DISABLE_PRDR
+                                   ACL_BIT_PRDR |
+# endif
+                                   ACL_BIT_ETRN | ACL_BIT_EXPN |
+                                   ACL_BIT_MAILAUTH |
+                                   ACL_BIT_MAIL | ACL_BIT_STARTTLS |
+                                   ACL_BIT_VRFY | ACL_BIT_PREDATA |
+                                   ACL_BIT_NOTSMTP_START,
+  },

 #endif
 #endif

-  US"condition",
-  US"continue",
-  US"control",
+  [ACLC_CONDITION] =           { US"condition",        TRUE, FALSE,    0 },
+  [ACLC_CONTINUE] =            { US"continue", TRUE, TRUE,     0 },
+
+  /* Certain types of control are always allowed, so we let it through
+  always and check in the control processing itself. */
+  [ACLC_CONTROL] =             { US"control",  TRUE, TRUE,     0 },
+

 #ifdef EXPERIMENTAL_DCC
 #ifdef EXPERIMENTAL_DCC

-  US"dcc",
+  [ACLC_DCC] =                 { US"dcc",              TRUE, FALSE,
+                                 (unsigned int)
+                                 ~(ACL_BIT_DATA |
+# ifndef DISABLE_PRDR
+                                 ACL_BIT_PRDR |
+# endif
+                                 ACL_BIT_NOTSMTP),
+  },

 #endif
 #ifdef WITH_CONTENT_SCAN
 #endif
 #ifdef WITH_CONTENT_SCAN

-  US"decode",
+  [ACLC_DECODE] =              { US"decode",           TRUE, FALSE, (unsigned int) ~ACL_BIT_MIME },
+

 #endif
 #endif

-  US"delay",
+  [ACLC_DELAY] =               { US"delay",            TRUE, TRUE, ACL_BIT_NOTQUIT },

 #ifndef DISABLE_DKIM
 #ifndef DISABLE_DKIM

-  US"dkim_signers",
-  US"dkim_status",
+  [ACLC_DKIM_SIGNER] =         { US"dkim_signers",     TRUE, FALSE, (unsigned int) ~ACL_BIT_DKIM },
+  [ACLC_DKIM_STATUS] =         { US"dkim_status",      TRUE, FALSE, (unsigned int) ~ACL_BIT_DKIM },

 #endif
 #ifdef EXPERIMENTAL_DMARC
 #endif
 #ifdef EXPERIMENTAL_DMARC

-  US"dmarc_status",
+  [ACLC_DMARC_STATUS] =                { US"dmarc_status",     TRUE, FALSE, (unsigned int) ~ACL_BIT_DATA },

 #endif
 #endif

-  US"dnslists",
-  US"domains",
-  US"encrypted",
-  US"endpass",
-  US"hosts",
-  US"local_parts",
-  US"log_message",
-  US"log_reject_target",
-  US"logwrite",
+
+  /* Explicit key lookups can be made in non-smtp ACLs so pass
+  always and check in the verify processing itself. */
+  [ACLC_DNSLISTS] =            { US"dnslists", TRUE, FALSE,    0 },
+
+  [ACLC_DOMAINS] =             { US"domains",  FALSE, FALSE,
+                                 (unsigned int)
+                                 ~(ACL_BIT_RCPT | ACL_BIT_VRFY
+#ifndef DISABLE_PRDR
+                                 |ACL_BIT_PRDR
+#endif
+      ),
+  },
+  [ACLC_ENCRYPTED] =           { US"encrypted",        FALSE, FALSE,
+                                 ACL_BIT_NOTSMTP | ACL_BIT_NOTSMTP_START |
+                                   ACL_BIT_HELO,
+  },
+
+  [ACLC_ENDPASS] =             { US"endpass",  TRUE, TRUE,     0 },
+
+  [ACLC_HOSTS] =               { US"hosts",            FALSE, FALSE,
+                                 ACL_BIT_NOTSMTP | ACL_BIT_NOTSMTP_START,
+  },
+  [ACLC_LOCAL_PARTS] =         { US"local_parts",      FALSE, FALSE,
+                                 (unsigned int)
+                                 ~(ACL_BIT_RCPT | ACL_BIT_VRFY
+#ifndef DISABLE_PRDR
+                                 | ACL_BIT_PRDR
+#endif
+      ),
+  },
+
+  [ACLC_LOG_MESSAGE] =         { US"log_message",      TRUE, TRUE,     0 },
+  [ACLC_LOG_REJECT_TARGET] =   { US"log_reject_target", TRUE, TRUE,    0 },
+  [ACLC_LOGWRITE] =            { US"logwrite", TRUE, TRUE,     0 },
+

 #ifdef WITH_CONTENT_SCAN
 #ifdef WITH_CONTENT_SCAN

-  US"malware",
+  [ACLC_MALWARE] =             { US"malware",  TRUE, FALSE,
+                                 (unsigned int)
+                                   ~(ACL_BIT_DATA |
+# ifndef DISABLE_PRDR
+                                   ACL_BIT_PRDR |
+# endif
+                                   ACL_BIT_NOTSMTP),
+  },

 #endif
 #endif

-  US"message",
+
+  [ACLC_MESSAGE] =             { US"message",  TRUE, TRUE,     0 },

 #ifdef WITH_CONTENT_SCAN
 #ifdef WITH_CONTENT_SCAN

-  US"mime_regex",
+  [ACLC_MIME_REGEX] =          { US"mime_regex",       TRUE, FALSE, (unsigned int) ~ACL_BIT_MIME },

 #endif
 #endif

-  US"ratelimit",
-  US"recipients",
+
+  [ACLC_QUEUE] =               { US"queue",            TRUE, TRUE,
+                                 ACL_BIT_NOTSMTP |
+#ifndef DISABLE_PRDR
+                                 ACL_BIT_PRDR |
+#endif
+                                 ACL_BIT_DATA,
+  },
+
+  [ACLC_RATELIMIT] =           { US"ratelimit",        TRUE, FALSE,    0 },
+  [ACLC_RECIPIENTS] =          { US"recipients",       FALSE, FALSE, (unsigned int) ~ACL_BIT_RCPT },
+

 #ifdef WITH_CONTENT_SCAN
 #ifdef WITH_CONTENT_SCAN

-  US"regex",
+  [ACLC_REGEX] =               { US"regex",            TRUE, FALSE,
+                                 (unsigned int)
+                                 ~(ACL_BIT_DATA |
+# ifndef DISABLE_PRDR
+                                   ACL_BIT_PRDR |
+# endif
+                                   ACL_BIT_NOTSMTP |
+                                   ACL_BIT_MIME),
+  },
+

 #endif
 #endif

-  US"remove_header",
-  US"sender_domains", US"senders", US"set",
+  [ACLC_REMOVE_HEADER] =       { US"remove_header",    TRUE, TRUE,
+                                 (unsigned int)
+                                 ~(ACL_BIT_MAIL|ACL_BIT_RCPT |
+                                   ACL_BIT_PREDATA | ACL_BIT_DATA |
+#ifndef DISABLE_PRDR
+                                   ACL_BIT_PRDR |
+#endif
+                                   ACL_BIT_MIME | ACL_BIT_NOTSMTP |
+                                   ACL_BIT_NOTSMTP_START),
+  },
+  [ACLC_SENDER_DOMAINS] =      { US"sender_domains",   FALSE, FALSE,
+                                 ACL_BIT_AUTH | ACL_BIT_CONNECT |
+                                   ACL_BIT_HELO |
+                                   ACL_BIT_MAILAUTH | ACL_BIT_QUIT |
+                                   ACL_BIT_ETRN | ACL_BIT_EXPN |
+                                   ACL_BIT_STARTTLS | ACL_BIT_VRFY,
+  },
+  [ACLC_SENDERS] =             { US"senders",  FALSE, FALSE,
+                                 ACL_BIT_AUTH | ACL_BIT_CONNECT |
+                                   ACL_BIT_HELO |
+                                   ACL_BIT_MAILAUTH | ACL_BIT_QUIT |
+                                   ACL_BIT_ETRN | ACL_BIT_EXPN |
+                                   ACL_BIT_STARTTLS | ACL_BIT_VRFY,
+  },
+
+  [ACLC_SET] =                 { US"set",              TRUE, TRUE,     0 },
+

 #ifdef WITH_CONTENT_SCAN
 #ifdef WITH_CONTENT_SCAN

-  US"spam",
+  [ACLC_SPAM] =                        { US"spam",             TRUE, FALSE,
+                                 (unsigned int) ~(ACL_BIT_DATA |
+# ifndef DISABLE_PRDR
+                                 ACL_BIT_PRDR |
+# endif
+                                 ACL_BIT_NOTSMTP),
+  },

 #endif
 #endif

-#ifdef EXPERIMENTAL_SPF
-  US"spf",
-  US"spf_guess",
+#ifdef SUPPORT_SPF
+  [ACLC_SPF] =                 { US"spf",              TRUE, FALSE,
+                                 ACL_BIT_AUTH | ACL_BIT_CONNECT |
+                                   ACL_BIT_HELO | ACL_BIT_MAILAUTH |
+                                   ACL_BIT_ETRN | ACL_BIT_EXPN |
+                                   ACL_BIT_STARTTLS | ACL_BIT_VRFY |
+                                   ACL_BIT_NOTSMTP | ACL_BIT_NOTSMTP_START,
+  },
+  [ACLC_SPF_GUESS] =           { US"spf_guess",        TRUE, FALSE,
+                                 ACL_BIT_AUTH | ACL_BIT_CONNECT |
+                                   ACL_BIT_HELO | ACL_BIT_MAILAUTH |
+                                   ACL_BIT_ETRN | ACL_BIT_EXPN |
+                                   ACL_BIT_STARTTLS | ACL_BIT_VRFY |
+                                   ACL_BIT_NOTSMTP | ACL_BIT_NOTSMTP_START,
+  },

 #endif
 #endif

-  US"udpsend",
-  US"verify" };
+  [ACLC_UDPSEND] =             { US"udpsend",          TRUE, TRUE,     0 },
+
+  /* Certain types of verify are always allowed, so we let it through
+  always and check in the verify function itself */
+  [ACLC_VERIFY] =              { US"verify",           TRUE, FALSE, 0 },
+};
+

 
 
 
 

-/* Return values from decode_control(); keep in step with the table of names
-that follows! */
+/* Return values from decode_control(); used as index so keep in step
+with the controls_list table that follows! */

 
 enum {
   CONTROL_AUTH_UNADVERTISED,
 #ifdef EXPERIMENTAL_BRIGHTMAIL
   CONTROL_BMI_RUN,
 #endif
 
 enum {
   CONTROL_AUTH_UNADVERTISED,
 #ifdef EXPERIMENTAL_BRIGHTMAIL
   CONTROL_BMI_RUN,
 #endif

+  CONTROL_CASEFUL_LOCAL_PART,
+  CONTROL_CASELOWER_LOCAL_PART,
+  CONTROL_CUTTHROUGH_DELIVERY,

   CONTROL_DEBUG,
 #ifndef DISABLE_DKIM
   CONTROL_DKIM_VERIFY,
   CONTROL_DEBUG,
 #ifndef DISABLE_DKIM
   CONTROL_DKIM_VERIFY,


@@ -187,556 +351,197 @@ enum {
   CONTROL_DMARC_FORENSIC,
 #endif
   CONTROL_DSCP,
   CONTROL_DMARC_FORENSIC,
 #endif
   CONTROL_DSCP,

-  CONTROL_ERROR,
-  CONTROL_CASEFUL_LOCAL_PART,
-  CONTROL_CASELOWER_LOCAL_PART,
-  CONTROL_CUTTHROUGH_DELIVERY,

   CONTROL_ENFORCE_SYNC,
   CONTROL_ENFORCE_SYNC,

-  CONTROL_NO_ENFORCE_SYNC,
+  CONTROL_ERROR,               /* pseudo-value for decode errors */
+  CONTROL_FAKEDEFER,
+  CONTROL_FAKEREJECT,

   CONTROL_FREEZE,
   CONTROL_FREEZE,

-  CONTROL_QUEUE_ONLY,
-  CONTROL_SUBMISSION,
-  CONTROL_SUPPRESS_LOCAL_FIXUPS,
+
+  CONTROL_NO_CALLOUT_FLUSH,
+  CONTROL_NO_DELAY_FLUSH,
+  CONTROL_NO_ENFORCE_SYNC,

 #ifdef WITH_CONTENT_SCAN
   CONTROL_NO_MBOX_UNSPOOL,
 #ifdef WITH_CONTENT_SCAN
   CONTROL_NO_MBOX_UNSPOOL,

-#endif
-  CONTROL_FAKEDEFER,
-  CONTROL_FAKEREJECT,
-#ifdef SUPPORT_I18N
-  CONTROL_UTF8_DOWNCONVERT,

 #endif
   CONTROL_NO_MULTILINE,
   CONTROL_NO_PIPELINING,
 #endif
   CONTROL_NO_MULTILINE,
   CONTROL_NO_PIPELINING,

-  CONTROL_NO_DELAY_FLUSH,
-  CONTROL_NO_CALLOUT_FLUSH
-};
-
-/* ACL control names; keep in step with the table above! This list is used for
-turning ids into names. The actual list of recognized names is in the variable
-control_def controls_list[] below. The fact that there are two lists is a mess
-and should be tidied up. */

 
 

-static uschar *controls[] = {
-  US"allow_auth_unadvertised",
-#ifdef EXPERIMENTAL_BRIGHTMAIL
-  US"bmi_run",
-#endif
-  US"debug",
-#ifndef DISABLE_DKIM
-  US"dkim_disable_verify",
-#endif
-#ifdef EXPERIMENTAL_DMARC
-  US"dmarc_disable_verify",
-  US"dmarc_enable_forensic",
-#endif
-  US"dscp",
-  US"error",
-  US"caseful_local_part",
-  US"caselower_local_part",
-  US"cutthrough_delivery",
-  US"enforce_sync",
-  US"no_enforce_sync",
-  US"freeze",
-  US"queue_only",
-  US"submission",
-  US"suppress_local_fixups",
-#ifdef WITH_CONTENT_SCAN
-  US"no_mbox_unspool",
+  CONTROL_QUEUE_ONLY,
+#if defined(SUPPORT_TLS) && defined(EXPERIMENTAL_REQUIRETLS)
+  CONTROL_REQUIRETLS,

 #endif
 #endif

-  US"fakedefer",
-  US"fakereject",
+  CONTROL_SUBMISSION,
+  CONTROL_SUPPRESS_LOCAL_FIXUPS,

 #ifdef SUPPORT_I18N
 #ifdef SUPPORT_I18N

-  US"utf8_downconvert",
-#endif
-  US"no_multiline_responses",
-  US"no_pipelining",
-  US"no_delay_flush",
-  US"no_callout_flush"
-};
-
-/* Flags to indicate for which conditions/modifiers a string expansion is done
-at the outer level. In the other cases, expansion already occurs in the
-checking functions. */
-
-static uschar cond_expand_at_top[] = {
-  FALSE,   /* acl */
-  TRUE,    /* add_header */
-  FALSE,   /* authenticated */
-#ifdef EXPERIMENTAL_BRIGHTMAIL
-  TRUE,    /* bmi_optin */
-#endif
-  TRUE,    /* condition */
-  TRUE,    /* continue */
-  TRUE,    /* control */
-#ifdef EXPERIMENTAL_DCC
-  TRUE,    /* dcc */
-#endif
-#ifdef WITH_CONTENT_SCAN
-  TRUE,    /* decode */
-#endif
-  TRUE,    /* delay */
-#ifndef DISABLE_DKIM
-  TRUE,    /* dkim_signers */
-  TRUE,    /* dkim_status */
-#endif
-#ifdef EXPERIMENTAL_DMARC
-  TRUE,    /* dmarc_status */
-#endif
-  TRUE,    /* dnslists */
-  FALSE,   /* domains */
-  FALSE,   /* encrypted */
-  TRUE,    /* endpass */
-  FALSE,   /* hosts */
-  FALSE,   /* local_parts */
-  TRUE,    /* log_message */
-  TRUE,    /* log_reject_target */
-  TRUE,    /* logwrite */
-#ifdef WITH_CONTENT_SCAN
-  TRUE,    /* malware */
-#endif
-  TRUE,    /* message */
-#ifdef WITH_CONTENT_SCAN
-  TRUE,    /* mime_regex */
-#endif
-  TRUE,    /* ratelimit */
-  FALSE,   /* recipients */
-#ifdef WITH_CONTENT_SCAN
-  TRUE,    /* regex */
-#endif
-  TRUE,    /* remove_header */
-  FALSE,   /* sender_domains */
-  FALSE,   /* senders */
-  TRUE,    /* set */
-#ifdef WITH_CONTENT_SCAN
-  TRUE,    /* spam */
-#endif
-#ifdef EXPERIMENTAL_SPF
-  TRUE,    /* spf */
-  TRUE,    /* spf_guess */
-#endif
-  TRUE,    /* udpsend */
-  TRUE     /* verify */
-};
-
-/* Flags to identify the modifiers */
-
-static uschar cond_modifiers[] = {
-  FALSE,   /* acl */
-  TRUE,    /* add_header */
-  FALSE,   /* authenticated */
-#ifdef EXPERIMENTAL_BRIGHTMAIL
-  TRUE,    /* bmi_optin */
-#endif
-  FALSE,   /* condition */
-  TRUE,    /* continue */
-  TRUE,    /* control */
-#ifdef EXPERIMENTAL_DCC
-  FALSE,   /* dcc */
-#endif
-#ifdef WITH_CONTENT_SCAN
-  FALSE,   /* decode */
-#endif
-  TRUE,    /* delay */
-#ifndef DISABLE_DKIM
-  FALSE,   /* dkim_signers */
-  FALSE,   /* dkim_status */
-#endif
-#ifdef EXPERIMENTAL_DMARC
-  FALSE,   /* dmarc_status */
-#endif
-  FALSE,   /* dnslists */
-  FALSE,   /* domains */
-  FALSE,   /* encrypted */
-  TRUE,    /* endpass */
-  FALSE,   /* hosts */
-  FALSE,   /* local_parts */
-  TRUE,    /* log_message */
-  TRUE,    /* log_reject_target */
-  TRUE,    /* logwrite */
-#ifdef WITH_CONTENT_SCAN
-  FALSE,   /* malware */
-#endif
-  TRUE,    /* message */
-#ifdef WITH_CONTENT_SCAN
-  FALSE,   /* mime_regex */
-#endif
-  FALSE,   /* ratelimit */
-  FALSE,   /* recipients */
-#ifdef WITH_CONTENT_SCAN
-  FALSE,   /* regex */
-#endif
-  TRUE,    /* remove_header */
-  FALSE,   /* sender_domains */
-  FALSE,   /* senders */
-  TRUE,    /* set */
-#ifdef WITH_CONTENT_SCAN
-  FALSE,   /* spam */
-#endif
-#ifdef EXPERIMENTAL_SPF
-  FALSE,   /* spf */
-  FALSE,   /* spf_guess */
+  CONTROL_UTF8_DOWNCONVERT,

 #endif
 #endif

-  TRUE,    /* udpsend */
-  FALSE    /* verify */

 };
 
 };
 

-/* Bit map vector of which conditions and modifiers are not allowed at certain
-times. For each condition and modifier, there's a bitmap of dis-allowed times.
-For some, it is easier to specify the negation of a small number of allowed
-times. */
-
-static unsigned int cond_forbids[] = {
-  0,                                               /* acl */
-
-  (unsigned int)
-  ~((1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)|       /* add_header */
-    (1<<ACL_WHERE_PREDATA)|(1<<ACL_WHERE_DATA)|
-  #ifndef DISABLE_PRDR
-    (1<<ACL_WHERE_PRDR)|
-  #endif
-    (1<<ACL_WHERE_MIME)|(1<<ACL_WHERE_NOTSMTP)|
-    (1<<ACL_WHERE_DKIM)|
-    (1<<ACL_WHERE_NOTSMTP_START)),
-
-  (1<<ACL_WHERE_NOTSMTP)|                          /* authenticated */
-    (1<<ACL_WHERE_NOTSMTP_START)|
-    (1<<ACL_WHERE_CONNECT)|(1<<ACL_WHERE_HELO),
-
-  #ifdef EXPERIMENTAL_BRIGHTMAIL
-  (1<<ACL_WHERE_AUTH)|                             /* bmi_optin */
-    (1<<ACL_WHERE_CONNECT)|(1<<ACL_WHERE_HELO)|
-    (1<<ACL_WHERE_DATA)|(1<<ACL_WHERE_MIME)|
-  #ifndef DISABLE_PRDR
-    (1<<ACL_WHERE_PRDR)|
-  #endif
-    (1<<ACL_WHERE_ETRN)|(1<<ACL_WHERE_EXPN)|
-    (1<<ACL_WHERE_MAILAUTH)|
-    (1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_STARTTLS)|
-    (1<<ACL_WHERE_VRFY)|(1<<ACL_WHERE_PREDATA)|
-    (1<<ACL_WHERE_NOTSMTP_START),
-  #endif
-
-  0,                                               /* condition */
-
-  0,                                               /* continue */
-
-  /* Certain types of control are always allowed, so we let it through
-  always and check in the control processing itself. */
-
-  0,                                               /* control */
-
-  #ifdef EXPERIMENTAL_DCC
-  (unsigned int)
-  ~((1<<ACL_WHERE_DATA)|                           /* dcc */
-  #ifndef DISABLE_PRDR
-    (1<<ACL_WHERE_PRDR)|
-  #endif
-    (1<<ACL_WHERE_NOTSMTP)),
-  #endif
-
-  #ifdef WITH_CONTENT_SCAN
-  (unsigned int)
-  ~(1<<ACL_WHERE_MIME),                            /* decode */
-  #endif
-
-  (1<<ACL_WHERE_NOTQUIT),                          /* delay */
-
-  #ifndef DISABLE_DKIM
-  (unsigned int)
-  ~(1<<ACL_WHERE_DKIM),                            /* dkim_signers */
-
-  (unsigned int)
-  ~(1<<ACL_WHERE_DKIM),                            /* dkim_status */
-  #endif
-
-  #ifdef EXPERIMENTAL_DMARC
-  (unsigned int)
-  ~(1<<ACL_WHERE_DATA),                            /* dmarc_status */
-  #endif
-
-  /* Explicit key lookups can be made in non-smtp ACLs so pass
-  always and check in the verify processing itself. */

 
 

-  0,                                              /* dnslists */
-
-  (unsigned int)
-  ~((1<<ACL_WHERE_RCPT)                            /* domains */
-    |(1<<ACL_WHERE_VRFY)
-  #ifndef DISABLE_PRDR
-    |(1<<ACL_WHERE_PRDR)
-  #endif
-    ),
-
-  (1<<ACL_WHERE_NOTSMTP)|                          /* encrypted */
-    (1<<ACL_WHERE_CONNECT)|
-    (1<<ACL_WHERE_NOTSMTP_START)|
-    (1<<ACL_WHERE_HELO),
-
-  0,                                               /* endpass */
-
-  (1<<ACL_WHERE_NOTSMTP)|                          /* hosts */
-    (1<<ACL_WHERE_NOTSMTP_START),
-
-  (unsigned int)
-  ~((1<<ACL_WHERE_RCPT)                             /* local_parts */
-    |(1<<ACL_WHERE_VRFY)
-  #ifndef DISABLE_PRDR
-    |(1<<ACL_WHERE_PRDR)
-  #endif
-    ),
-
-  0,                                               /* log_message */
-
-  0,                                               /* log_reject_target */
-
-  0,                                               /* logwrite */
-
-  #ifdef WITH_CONTENT_SCAN
-  (unsigned int)
-  ~((1<<ACL_WHERE_DATA)|                           /* malware */
-  #ifndef DISABLE_PRDR
-    (1<<ACL_WHERE_PRDR)|
-  #endif
-    (1<<ACL_WHERE_NOTSMTP)),
-  #endif
-
-  0,                                               /* message */
-
-  #ifdef WITH_CONTENT_SCAN
-  (unsigned int)
-  ~(1<<ACL_WHERE_MIME),                            /* mime_regex */
-  #endif
-
-  0,                                               /* ratelimit */
-
-  (unsigned int)
-  ~(1<<ACL_WHERE_RCPT),                            /* recipients */
-
-  #ifdef WITH_CONTENT_SCAN
-  (unsigned int)
-  ~((1<<ACL_WHERE_DATA)|                           /* regex */
-  #ifndef DISABLE_PRDR
-    (1<<ACL_WHERE_PRDR)|
-  #endif
-    (1<<ACL_WHERE_NOTSMTP)|
-    (1<<ACL_WHERE_MIME)),
-  #endif
-
-  (unsigned int)
-  ~((1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)|       /* remove_header */
-    (1<<ACL_WHERE_PREDATA)|(1<<ACL_WHERE_DATA)|
-  #ifndef DISABLE_PRDR
-    (1<<ACL_WHERE_PRDR)|
-  #endif
-    (1<<ACL_WHERE_MIME)|(1<<ACL_WHERE_NOTSMTP)|
-    (1<<ACL_WHERE_NOTSMTP_START)),
-
-  (1<<ACL_WHERE_AUTH)|(1<<ACL_WHERE_CONNECT)|      /* sender_domains */
-    (1<<ACL_WHERE_HELO)|
-    (1<<ACL_WHERE_MAILAUTH)|(1<<ACL_WHERE_QUIT)|
-    (1<<ACL_WHERE_ETRN)|(1<<ACL_WHERE_EXPN)|
-    (1<<ACL_WHERE_STARTTLS)|(1<<ACL_WHERE_VRFY),
-
-  (1<<ACL_WHERE_AUTH)|(1<<ACL_WHERE_CONNECT)|      /* senders */
-    (1<<ACL_WHERE_HELO)|
-    (1<<ACL_WHERE_MAILAUTH)|(1<<ACL_WHERE_QUIT)|
-    (1<<ACL_WHERE_ETRN)|(1<<ACL_WHERE_EXPN)|
-    (1<<ACL_WHERE_STARTTLS)|(1<<ACL_WHERE_VRFY),
-
-  0,                                               /* set */
-
-  #ifdef WITH_CONTENT_SCAN
-  (unsigned int)
-  ~((1<<ACL_WHERE_DATA)|                           /* spam */
-  #ifndef DISABLE_PRDR
-    (1<<ACL_WHERE_PRDR)|
-  #endif
-    (1<<ACL_WHERE_NOTSMTP)),
-  #endif
-
-  #ifdef EXPERIMENTAL_SPF
-  (1<<ACL_WHERE_AUTH)|(1<<ACL_WHERE_CONNECT)|      /* spf */
-    (1<<ACL_WHERE_HELO)|
-    (1<<ACL_WHERE_MAILAUTH)|
-    (1<<ACL_WHERE_ETRN)|(1<<ACL_WHERE_EXPN)|
-    (1<<ACL_WHERE_STARTTLS)|(1<<ACL_WHERE_VRFY)|
-    (1<<ACL_WHERE_NOTSMTP)|
-    (1<<ACL_WHERE_NOTSMTP_START),
-
-  (1<<ACL_WHERE_AUTH)|(1<<ACL_WHERE_CONNECT)|      /* spf_guess */
-    (1<<ACL_WHERE_HELO)|
-    (1<<ACL_WHERE_MAILAUTH)|
-    (1<<ACL_WHERE_ETRN)|(1<<ACL_WHERE_EXPN)|
-    (1<<ACL_WHERE_STARTTLS)|(1<<ACL_WHERE_VRFY)|
-    (1<<ACL_WHERE_NOTSMTP)|
-    (1<<ACL_WHERE_NOTSMTP_START),
-  #endif
-
-  0,                                               /* udpsend */
-
-  /* Certain types of verify are always allowed, so we let it through
-  always and check in the verify function itself */
-
-  0                                                /* verify */
-};

 
 

+/* Structure listing various control arguments, with their characteristics.
+For each control, there's a bitmap of dis-allowed times. For some, it is easier
+to specify the negation of a small number of allowed times. */

 
 

-/* Bit map vector of which controls are not allowed at certain times. For
-each control, there's a bitmap of dis-allowed times. For some, it is easier to
-specify the negation of a small number of allowed times. */
-
-static unsigned int control_forbids[] = {
-  (unsigned int)
-  ~((1<<ACL_WHERE_CONNECT)|(1<<ACL_WHERE_HELO)),   /* allow_auth_unadvertised */
+typedef struct control_def {
+  uschar       *name;
+  BOOL         has_option;     /* Has /option(s) following */
+  unsigned     forbids;        /* bitmap of dis-allowed times */
+} control_def;

 
 

+static control_def controls_list[] = {
+  /*   name                    has_option      forbids */
+[CONTROL_AUTH_UNADVERTISED] =
+  { US"allow_auth_unadvertised", FALSE,
+                                 (unsigned)
+                                 ~(ACL_BIT_CONNECT | ACL_BIT_HELO)
+  },

 #ifdef EXPERIMENTAL_BRIGHTMAIL
 #ifdef EXPERIMENTAL_BRIGHTMAIL

-  0,                                               /* bmi_run */
+[CONTROL_BMI_RUN] =
+  { US"bmi_run",                 FALSE,                0 },

 #endif
 #endif

-
-  0,                                               /* debug */
+[CONTROL_CASEFUL_LOCAL_PART] =
+  { US"caseful_local_part",      FALSE, (unsigned) ~ACL_BIT_RCPT },
+[CONTROL_CASELOWER_LOCAL_PART] =
+  { US"caselower_local_part",    FALSE, (unsigned) ~ACL_BIT_RCPT },
+[CONTROL_CUTTHROUGH_DELIVERY] =
+  { US"cutthrough_delivery",     TRUE,         0 },
+[CONTROL_DEBUG] =
+  { US"debug",                   TRUE,         0 },

 
 #ifndef DISABLE_DKIM
 
 #ifndef DISABLE_DKIM

-  (1<<ACL_WHERE_DATA)|(1<<ACL_WHERE_NOTSMTP)|      /* dkim_disable_verify */
+[CONTROL_DKIM_VERIFY] =
+  { US"dkim_disable_verify",     FALSE,
+                                 ACL_BIT_DATA | ACL_BIT_NOTSMTP |

 # ifndef DISABLE_PRDR
 # ifndef DISABLE_PRDR

-    (1<<ACL_WHERE_PRDR)|
+                                 ACL_BIT_PRDR |

 # endif
 # endif

-    (1<<ACL_WHERE_NOTSMTP_START),
+                                 ACL_BIT_NOTSMTP_START
+  },

 #endif
 
 #ifdef EXPERIMENTAL_DMARC
 #endif
 
 #ifdef EXPERIMENTAL_DMARC

-  (1<<ACL_WHERE_DATA)|(1<<ACL_WHERE_NOTSMTP)|      /* dmarc_disable_verify */
-    (1<<ACL_WHERE_NOTSMTP_START),
-  (1<<ACL_WHERE_DATA)|(1<<ACL_WHERE_NOTSMTP)|      /* dmarc_enable_forensic */
-    (1<<ACL_WHERE_NOTSMTP_START),
-#endif
-
-  (1<<ACL_WHERE_NOTSMTP)|
-    (1<<ACL_WHERE_NOTSMTP_START)|
-    (1<<ACL_WHERE_NOTQUIT),                        /* dscp */
-
-  0,                                               /* error */
-
-  (unsigned int)
-  ~(1<<ACL_WHERE_RCPT),                            /* caseful_local_part */
-
-  (unsigned int)
-  ~(1<<ACL_WHERE_RCPT),                            /* caselower_local_part */
-
-  (unsigned int)
-  0,                                              /* cutthrough_delivery */
-
-  (1<<ACL_WHERE_NOTSMTP)|                          /* enforce_sync */
-    (1<<ACL_WHERE_NOTSMTP_START),
-
-  (1<<ACL_WHERE_NOTSMTP)|                          /* no_enforce_sync */
-    (1<<ACL_WHERE_NOTSMTP_START),
-
-  (unsigned int)
-  ~((1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)|       /* freeze */
-    (1<<ACL_WHERE_PREDATA)|(1<<ACL_WHERE_DATA)|
-    // (1<<ACL_WHERE_PRDR)|    /* Not allow one user to freeze for all */
-    (1<<ACL_WHERE_NOTSMTP)|(1<<ACL_WHERE_MIME)),
-
-  (unsigned int)
-  ~((1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)|       /* queue_only */
-    (1<<ACL_WHERE_PREDATA)|(1<<ACL_WHERE_DATA)|
-    // (1<<ACL_WHERE_PRDR)|    /* Not allow one user to freeze for all */
-    (1<<ACL_WHERE_NOTSMTP)|(1<<ACL_WHERE_MIME)),
-
-  (unsigned int)
-  ~((1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)|       /* submission */
-    (1<<ACL_WHERE_PREDATA)),
-
-  (unsigned int)
-  ~((1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)|       /* suppress_local_fixups */
-    (1<<ACL_WHERE_PREDATA)|
-    (1<<ACL_WHERE_NOTSMTP_START)),
-
-#ifdef WITH_CONTENT_SCAN
-  (unsigned int)
-  ~((1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)|       /* no_mbox_unspool */
-    (1<<ACL_WHERE_PREDATA)|(1<<ACL_WHERE_DATA)|
-    // (1<<ACL_WHERE_PRDR)|    /* Not allow one user to freeze for all */
-    (1<<ACL_WHERE_MIME)),
+[CONTROL_DMARC_VERIFY] =
+  { US"dmarc_disable_verify",    FALSE,
+         ACL_BIT_DATA | ACL_BIT_NOTSMTP | ACL_BIT_NOTSMTP_START
+  },
+[CONTROL_DMARC_FORENSIC] =
+  { US"dmarc_enable_forensic",   FALSE,
+         ACL_BIT_DATA | ACL_BIT_NOTSMTP | ACL_BIT_NOTSMTP_START
+  },

 #endif
 
 #endif
 

-  (unsigned int)
-  ~((1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)|       /* fakedefer */
-    (1<<ACL_WHERE_PREDATA)|(1<<ACL_WHERE_DATA)|
+[CONTROL_DSCP] =
+  { US"dscp",                    TRUE,
+         ACL_BIT_NOTSMTP | ACL_BIT_NOTSMTP_START | ACL_BIT_NOTQUIT
+  },
+[CONTROL_ENFORCE_SYNC] =
+  { US"enforce_sync",            FALSE,
+         ACL_BIT_NOTSMTP | ACL_BIT_NOTSMTP_START
+  },
+
+  /* Pseudo-value for decode errors */
+[CONTROL_ERROR] =
+  { US"error",                   FALSE, 0 },
+
+[CONTROL_FAKEDEFER] =
+  { US"fakedefer",               TRUE,
+         (unsigned)
+         ~(ACL_BIT_MAIL | ACL_BIT_RCPT |
+           ACL_BIT_PREDATA | ACL_BIT_DATA |

 #ifndef DISABLE_PRDR
 #ifndef DISABLE_PRDR

-    (1<<ACL_WHERE_PRDR)|
+           ACL_BIT_PRDR |

 #endif
 #endif

-    (1<<ACL_WHERE_MIME)),
-
-  (unsigned int)
-  ~((1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)|       /* fakereject */
-    (1<<ACL_WHERE_PREDATA)|(1<<ACL_WHERE_DATA)|
+           ACL_BIT_MIME)
+  },
+[CONTROL_FAKEREJECT] =
+  { US"fakereject",              TRUE,
+         (unsigned)
+         ~(ACL_BIT_MAIL | ACL_BIT_RCPT |
+           ACL_BIT_PREDATA | ACL_BIT_DATA |

 #ifndef DISABLE_PRDR
 #ifndef DISABLE_PRDR

-    (1<<ACL_WHERE_PRDR)|
+         ACL_BIT_PRDR |

 #endif
 #endif

-    (1<<ACL_WHERE_MIME)),
-
-#ifdef SUPPORT_I18N
-  0,                                               /* utf8_downconvert */
-#endif
-
-  (1<<ACL_WHERE_NOTSMTP)|                          /* no_multiline */
-    (1<<ACL_WHERE_NOTSMTP_START),
-
-  (1<<ACL_WHERE_NOTSMTP)|                          /* no_pipelining */
-    (1<<ACL_WHERE_NOTSMTP_START),
-
-  (1<<ACL_WHERE_NOTSMTP)|                          /* no_delay_flush */
-    (1<<ACL_WHERE_NOTSMTP_START),
-
-  (1<<ACL_WHERE_NOTSMTP)|                          /* no_callout_flush */
-    (1<<ACL_WHERE_NOTSMTP_START)
-};
-
-/* Structure listing various control arguments, with their characteristics. */
-
-typedef struct control_def {
-  uschar *name;
-  int    value;                  /* CONTROL_xxx value */
-  BOOL   has_option;             /* Has /option(s) following */
-} control_def;
-
-static control_def controls_list[] = {
-  { US"allow_auth_unadvertised", CONTROL_AUTH_UNADVERTISED,     FALSE },
-#ifdef EXPERIMENTAL_BRIGHTMAIL
-  { US"bmi_run",                 CONTROL_BMI_RUN,               FALSE },
-#endif
-  { US"debug",                   CONTROL_DEBUG,                 TRUE },
-#ifndef DISABLE_DKIM
-  { US"dkim_disable_verify",     CONTROL_DKIM_VERIFY,           FALSE },
-#endif
-#ifdef EXPERIMENTAL_DMARC
-  { US"dmarc_disable_verify",    CONTROL_DMARC_VERIFY,          FALSE },
-  { US"dmarc_enable_forensic",   CONTROL_DMARC_FORENSIC,        FALSE },
-#endif
-  { US"dscp",                    CONTROL_DSCP,                  TRUE },
-  { US"caseful_local_part",      CONTROL_CASEFUL_LOCAL_PART,    FALSE },
-  { US"caselower_local_part",    CONTROL_CASELOWER_LOCAL_PART,  FALSE },
-  { US"enforce_sync",            CONTROL_ENFORCE_SYNC,          FALSE },
-  { US"freeze",                  CONTROL_FREEZE,                TRUE },
-  { US"no_callout_flush",        CONTROL_NO_CALLOUT_FLUSH,      FALSE },
-  { US"no_delay_flush",          CONTROL_NO_DELAY_FLUSH,        FALSE },
-  { US"no_enforce_sync",         CONTROL_NO_ENFORCE_SYNC,       FALSE },
-  { US"no_multiline_responses",  CONTROL_NO_MULTILINE,          FALSE },
-  { US"no_pipelining",           CONTROL_NO_PIPELINING,         FALSE },
-  { US"queue_only",              CONTROL_QUEUE_ONLY,            FALSE },
+         ACL_BIT_MIME)
+  },
+[CONTROL_FREEZE] =
+  { US"freeze",                  TRUE,
+         (unsigned)
+         ~(ACL_BIT_MAIL | ACL_BIT_RCPT |
+           ACL_BIT_PREDATA | ACL_BIT_DATA |
+           // ACL_BIT_PRDR|    /* Not allow one user to freeze for all */
+           ACL_BIT_NOTSMTP | ACL_BIT_MIME)
+  },
+
+[CONTROL_NO_CALLOUT_FLUSH] =
+  { US"no_callout_flush",        FALSE,
+         ACL_BIT_NOTSMTP | ACL_BIT_NOTSMTP_START
+  },
+[CONTROL_NO_DELAY_FLUSH] =
+  { US"no_delay_flush",          FALSE,
+         ACL_BIT_NOTSMTP | ACL_BIT_NOTSMTP_START
+  },
+  
+[CONTROL_NO_ENFORCE_SYNC] =
+  { US"no_enforce_sync",         FALSE,
+         ACL_BIT_NOTSMTP | ACL_BIT_NOTSMTP_START
+  },

 #ifdef WITH_CONTENT_SCAN
 #ifdef WITH_CONTENT_SCAN

-  { US"no_mbox_unspool",         CONTROL_NO_MBOX_UNSPOOL,       FALSE },
+[CONTROL_NO_MBOX_UNSPOOL] =
+  { US"no_mbox_unspool",         FALSE,
+       (unsigned)
+       ~(ACL_BIT_MAIL | ACL_BIT_RCPT |
+         ACL_BIT_PREDATA | ACL_BIT_DATA |
+         // ACL_BIT_PRDR|    /* Not allow one user to freeze for all */
+         ACL_BIT_MIME)
+  },

 #endif
 #endif

-  { US"fakedefer",               CONTROL_FAKEDEFER,             TRUE },
-  { US"fakereject",              CONTROL_FAKEREJECT,            TRUE },
-  { US"submission",              CONTROL_SUBMISSION,            TRUE },
-  { US"suppress_local_fixups",   CONTROL_SUPPRESS_LOCAL_FIXUPS, FALSE },
-  { US"cutthrough_delivery",     CONTROL_CUTTHROUGH_DELIVERY,   FALSE },
+[CONTROL_NO_MULTILINE] =
+  { US"no_multiline_responses",  FALSE,
+         ACL_BIT_NOTSMTP | ACL_BIT_NOTSMTP_START
+  },
+[CONTROL_NO_PIPELINING] =
+  { US"no_pipelining",           FALSE,
+         ACL_BIT_NOTSMTP | ACL_BIT_NOTSMTP_START
+  },
+
+[CONTROL_QUEUE_ONLY] =
+  { US"queue_only",              FALSE,
+         (unsigned)
+         ~(ACL_BIT_MAIL | ACL_BIT_RCPT |
+           ACL_BIT_PREDATA | ACL_BIT_DATA |
+           // ACL_BIT_PRDR|    /* Not allow one user to freeze for all */
+           ACL_BIT_NOTSMTP | ACL_BIT_MIME)
+  },
+
+
+#if defined(SUPPORT_TLS) && defined(EXPERIMENTAL_REQUIRETLS)
+[CONTROL_REQUIRETLS] =
+  { US"requiretls",             FALSE,
+         (unsigned)
+         ~(ACL_BIT_MAIL | ACL_BIT_RCPT | ACL_BIT_PREDATA |
+           ACL_BIT_DATA | ACL_BIT_MIME |
+           ACL_BIT_NOTSMTP)
+  },
+#endif
+
+[CONTROL_SUBMISSION] =
+  { US"submission",              TRUE,
+         (unsigned)
+         ~(ACL_BIT_MAIL | ACL_BIT_RCPT | ACL_BIT_PREDATA)
+  },
+[CONTROL_SUPPRESS_LOCAL_FIXUPS] =
+  { US"suppress_local_fixups",   FALSE,
+    (unsigned)
+    ~(ACL_BIT_MAIL | ACL_BIT_RCPT | ACL_BIT_PREDATA |
+      ACL_BIT_NOTSMTP_START)
+  },

 #ifdef SUPPORT_I18N
 #ifdef SUPPORT_I18N

-  { US"utf8_downconvert",        CONTROL_UTF8_DOWNCONVERT,      TRUE }
+[CONTROL_UTF8_DOWNCONVERT] =
+  { US"utf8_downconvert",        TRUE, (unsigned) ~(ACL_BIT_RCPT | ACL_BIT_VRFY)
+  }

 #endif
 #endif

-  };
+};

 
 /* Support data structures for Client SMTP Authorization. acl_verify_csa()
 caches its result in a tree to avoid repeated DNS queries. The result is an
 
 /* Support data structures for Client SMTP Authorization. acl_verify_csa()
 caches its result in a tree to avoid repeated DNS queries. The result is an


@@ -757,24 +562,36 @@ further ACL conditions to distinguish ok, unknown, and defer if required, but
 the aim is to make the usual configuration simple. */
 
 static int csa_return_code[] = {
 the aim is to make the usual configuration simple. */
 
 static int csa_return_code[] = {

-  OK, OK, OK, OK,
-  FAIL, FAIL, FAIL, FAIL
+  [CSA_UNKNOWN] =      OK,
+  [CSA_OK] =           OK,
+  [CSA_DEFER_SRV] =    OK,
+  [CSA_DEFER_ADDR] =   OK,
+  [CSA_FAIL_EXPLICIT] =        FAIL,
+  [CSA_FAIL_DOMAIN] =  FAIL,
+  [CSA_FAIL_NOADDR] =  FAIL,
+  [CSA_FAIL_MISMATCH] =        FAIL

 };
 
 static uschar *csa_status_string[] = {
 };
 
 static uschar *csa_status_string[] = {

-  US"unknown", US"ok", US"defer", US"defer",
-  US"fail", US"fail", US"fail", US"fail"
+  [CSA_UNKNOWN] =      US"unknown",
+  [CSA_OK] =           US"ok",
+  [CSA_DEFER_SRV] =    US"defer",
+  [CSA_DEFER_ADDR] =   US"defer",
+  [CSA_FAIL_EXPLICIT] =        US"fail",
+  [CSA_FAIL_DOMAIN] =  US"fail",
+  [CSA_FAIL_NOADDR] =  US"fail",
+  [CSA_FAIL_MISMATCH] =        US"fail"

 };
 
 static uschar *csa_reason_string[] = {
 };
 
 static uschar *csa_reason_string[] = {

-  US"unknown",
-  US"ok",
-  US"deferred (SRV lookup failed)",
-  US"deferred (target address lookup failed)",
-  US"failed (explicit authorization required)",
-  US"failed (host name not authorized)",
-  US"failed (no authorized addresses)",
-  US"failed (client address mismatch)"
+  [CSA_UNKNOWN] =      US"unknown",
+  [CSA_OK] =           US"ok",
+  [CSA_DEFER_SRV] =    US"deferred (SRV lookup failed)",
+  [CSA_DEFER_ADDR] =   US"deferred (target address lookup failed)",
+  [CSA_FAIL_EXPLICIT] =        US"failed (explicit authorization required)",
+  [CSA_FAIL_DOMAIN] =  US"failed (host name not authorized)",
+  [CSA_FAIL_NOADDR] =  US"failed (no authorized addresses)",
+  [CSA_FAIL_MISMATCH] =        US"failed (client address mismatch)"

 };
 
 /* Options for the ratelimit condition. Note that there are two variants of
 };
 
 /* Options for the ratelimit condition. Note that there are two variants of


@@ -792,16 +609,85 @@ enum {
   (((var) == RATE_PER_WHAT) ? ((var) = RATE_##new) : ((var) = RATE_PER_CLASH))
 
 static uschar *ratelimit_option_string[] = {
   (((var) == RATE_PER_WHAT) ? ((var) = RATE_##new) : ((var) = RATE_PER_CLASH))
 
 static uschar *ratelimit_option_string[] = {

-  US"?", US"!", US"per_addr", US"per_byte", US"per_cmd",
-  US"per_conn", US"per_mail", US"per_rcpt", US"per_rcpt"
+  [RATE_PER_WHAT] =    US"?",
+  [RATE_PER_CLASH] =   US"!",
+  [RATE_PER_ADDR] =    US"per_addr",
+  [RATE_PER_BYTE] =    US"per_byte",
+  [RATE_PER_CMD] =     US"per_cmd",
+  [RATE_PER_CONN] =    US"per_conn",
+  [RATE_PER_MAIL] =    US"per_mail",
+  [RATE_PER_RCPT] =    US"per_rcpt",
+  [RATE_PER_ALLRCPTS] =        US"per_rcpt"

 };
 
 /* Enable recursion between acl_check_internal() and acl_check_condition() */
 
 };
 
 /* Enable recursion between acl_check_internal() and acl_check_condition() */
 

-static int acl_check_wargs(int, address_item *, const uschar *, int, uschar **,
+static int acl_check_wargs(int, address_item *, const uschar *, uschar **,

     uschar **);
 
 
     uschar **);
 
 

+/*************************************************
+*            Find control in list                *
+*************************************************/
+
+/* The lists are always in order, so binary chop can be used.
+
+Arguments:
+  name      the control name to search for
+  ol        the first entry in the control list
+  last      one more than the offset of the last entry in the control list
+
+Returns:    index of a control entry, or -1 if not found
+*/
+
+static int
+find_control(const uschar * name, control_def * ol, int last)
+{
+int first = 0;
+while (last > first)
+  {
+  int middle = (first + last)/2;
+  uschar * s =  ol[middle].name;
+  int c = Ustrncmp(name, s, Ustrlen(s));
+  if (c == 0) return middle;
+  else if (c > 0) first = middle + 1;
+  else last = middle;
+  }
+return -1;
+}
+
+
+
+/*************************************************
+*         Pick out condition from list           *
+*************************************************/
+
+/* Use a binary chop method
+
+Arguments:
+  name        name to find
+  list        list of conditions
+  end         size of list
+
+Returns:      offset in list, or -1 if not found
+*/
+
+static int
+acl_checkcondition(uschar * name, condition_def * list, int end)
+{
+int start = 0;
+while (start < end)
+  {
+  int mid = (start + end)/2;
+  int c = Ustrcmp(name, list[mid].name);
+  if (c == 0) return mid;
+  if (c < 0) end = mid;
+  else start = mid + 1;
+  }
+return -1;
+}
+
+

 /*************************************************
 *         Pick out name from list                *
 *************************************************/
 /*************************************************
 *         Pick out name from list                *
 *************************************************/


@@ -889,8 +775,7 @@ while ((s = (*func)()) != NULL)
   /* If a verb is unrecognized, it may be another condition or modifier that
   continues the previous verb. */
 
   /* If a verb is unrecognized, it may be another condition or modifier that
   continues the previous verb. */
 

-  v = acl_checkname(name, verbs, sizeof(verbs)/sizeof(char *));
-  if (v < 0)
+  if ((v = acl_checkname(name, verbs, nelem(verbs))) < 0)

     {
     if (this == NULL)
       {
     {
     if (this == NULL)
       {


@@ -927,8 +812,7 @@ while ((s = (*func)()) != NULL)
 
   /* Handle a condition or modifier. */
 
 
   /* Handle a condition or modifier. */
 

-  c = acl_checkname(name, conditions, sizeof(conditions)/sizeof(char *));
-  if (c < 0)
+  if ((c = acl_checkcondition(name, conditions, nelem(conditions))) < 0)

     {
     *error = string_sprintf("unknown ACL condition/modifier in \"%s\"",
       saveline);
     {
     *error = string_sprintf("unknown ACL condition/modifier in \"%s\"",
       saveline);


@@ -937,10 +821,10 @@ while ((s = (*func)()) != NULL)
 
   /* The modifiers may not be negated */
 
 
   /* The modifiers may not be negated */
 

-  if (negated && cond_modifiers[c])
+  if (negated && conditions[c].is_modifier)

     {
     *error = string_sprintf("ACL error: negation is not allowed with "
     {
     *error = string_sprintf("ACL error: negation is not allowed with "

-      "\"%s\"", conditions[c]);
+      "\"%s\"", conditions[c].name);

     return NULL;
     }
 
     return NULL;
     }
 


@@ -951,7 +835,7 @@ while ((s = (*func)()) != NULL)
       this->verb != ACL_DISCARD)
     {
     *error = string_sprintf("ACL error: \"%s\" is not allowed with \"%s\"",
       this->verb != ACL_DISCARD)
     {
     *error = string_sprintf("ACL error: \"%s\" is not allowed with \"%s\"",

-      conditions[c], verbs[this->verb]);
+      conditions[c].name, verbs[this->verb]);

     return NULL;
     }
 
     return NULL;
     }
 


@@ -974,6 +858,26 @@ while ((s = (*func)()) != NULL)
   compatibility. */
 
   if (c == ACLC_SET)
   compatibility. */
 
   if (c == ACLC_SET)

+#ifndef DISABLE_DKIM
+    if (  Ustrncmp(s, "dkim_verify_status", 18) == 0
+       || Ustrncmp(s, "dkim_verify_reason", 18) == 0)
+      {
+      uschar * endptr = s+18;
+
+      if (isalnum(*endptr))
+       {
+       *error = string_sprintf("invalid variable name after \"set\" in ACL "
+         "modifier \"set %s\" "
+         "(only \"dkim_verify_status\" or \"dkim_verify_reason\" permitted)",
+         s);
+       return NULL;
+       }
+      cond->u.varname = string_copyn(s, 18);
+      s = endptr;
+      while (isspace(*s)) s++;
+      }
+    else
+#endif

     {
     uschar *endptr;
 
     {
     uschar *endptr;
 


@@ -1018,7 +922,7 @@ while ((s = (*func)()) != NULL)
     if (*s++ != '=')
       {
       *error = string_sprintf("\"=\" missing after ACL \"%s\" %s", name,
     if (*s++ != '=')
       {
       *error = string_sprintf("\"=\" missing after ACL \"%s\" %s", name,

-        cond_modifiers[c]? US"modifier" : US"condition");
+        conditions[c].is_modifier ? US"modifier" : US"condition");

       return NULL;
       }
     while (isspace(*s)) s++;
       return NULL;
       }
     while (isspace(*s)) s++;


@@ -1069,7 +973,7 @@ else
 
 /* Loop for multiple header lines, taking care about continuations */
 
 
 /* Loop for multiple header lines, taking care about continuations */
 

-for (p = q; *p != 0; )
+for (p = q; *p; p = q)

   {
   const uschar *s;
   uschar * hdr;
   {
   const uschar *s;
   uschar * hdr;


@@ -1081,7 +985,7 @@ for (p = q; *p != 0; )
   for (;;)
     {
     q = Ustrchr(q, '\n');              /* we know there was a newline */
   for (;;)
     {
     q = Ustrchr(q, '\n');              /* we know there was a newline */

-    if (*(++q) != ' ' && *q != '\t') break;
+    if (*++q != ' ' && *q != '\t') break;

     }
 
   /* If the line starts with a colon, interpret the instruction for where to
     }
 
   /* If the line starts with a colon, interpret the instruction for where to


@@ -1116,24 +1020,22 @@ for (p = q; *p != 0; )
   to the front of it. */
 
   for (s = p; s < q - 1; s++)
   to the front of it. */
 
   for (s = p; s < q - 1; s++)

-    {

     if (*s == ':' || !isgraph(*s)) break;
     if (*s == ':' || !isgraph(*s)) break;

-    }

 
 

-  hdr = string_sprintf("%s%.*s", (*s == ':')? "" : "X-ACL-Warn: ", (int) (q - p), p);
+  hdr = string_sprintf("%s%.*s", *s == ':' ? "" : "X-ACL-Warn: ", (int) (q - p), p);

   hlen = Ustrlen(hdr);
 
   /* See if this line has already been added */
 
   hlen = Ustrlen(hdr);
 
   /* See if this line has already been added */
 

-  while (*hptr != NULL)
+  while (*hptr)

     {
     if (Ustrncmp((*hptr)->text, hdr, hlen) == 0) break;
     {
     if (Ustrncmp((*hptr)->text, hdr, hlen) == 0) break;

-    hptr = &((*hptr)->next);
+    hptr = &(*hptr)->next;

     }
 
   /* Add if not previously present */
 
     }
 
   /* Add if not previously present */
 

-  if (*hptr == NULL)
+  if (!*hptr)

     {
     header_line *h = store_get(sizeof(header_line));
     h->text = hdr;
     {
     header_line *h = store_get(sizeof(header_line));
     h->text = hdr;


@@ -1141,12 +1043,8 @@ for (p = q; *p != 0; )
     h->type = newtype;
     h->slen = hlen;
     *hptr = h;
     h->type = newtype;
     h->slen = hlen;
     *hptr = h;

-    hptr = &(h->next);
+    hptr = &h->next;

     }
     }

-
-  /* Advance for next header line within the string */
-
-  p = q;

   }
 }
 
   }
 }
 


@@ -1158,35 +1056,17 @@ for (p = q; *p != 0; )
 uschar *
 fn_hdrs_added(void)
 {
 uschar *
 fn_hdrs_added(void)
 {

-uschar * ret = NULL;
-header_line * h = acl_added_headers;
-uschar * s;
-uschar * cp;
-int size = 0;
-int ptr = 0;
-
-if (!h) return NULL;
+gstring * g = NULL;
+header_line * h;

 
 

-do
+for (h = acl_added_headers; h; h = h->next)

   {
   {

-  s = h->text;
-  while ((cp = Ustrchr(s, '\n')) != NULL)
-    {
-    if (cp[1] == '\0') break;
-
-    /* contains embedded newline; needs doubling */
-    ret = string_cat(ret, &size, &ptr, s, cp-s+1);
-    ret = string_cat(ret, &size, &ptr, US"\n", 1);
-    s = cp+1;
-    }
-  /* last bit of header */
-
-  ret = string_cat(ret, &size, &ptr, s, cp-s+1);       /* newline-sep list */
+  int i = h->slen;
+  if (h->text[i-1] == '\n') i--;
+  g = string_append_listele_n(g, '\n', h->text, i);

   }
   }

-while((h = h->next));

 
 

-ret[ptr-1] = '\0';     /* overwrite last newline */
-return ret;
+return g ? g->s : NULL;

 }
 
 
 }
 
 


@@ -1205,7 +1085,7 @@ Returns:    nothing
 static void
 setup_remove_header(const uschar *hnames)
 {
 static void
 setup_remove_header(const uschar *hnames)
 {

-if (*hnames != 0)
+if (*hnames)

   acl_removed_headers = acl_removed_headers
     ? string_sprintf("%s : %s", acl_removed_headers, hnames)
     : string_copy(hnames);
   acl_removed_headers = acl_removed_headers
     ? string_sprintf("%s : %s", acl_removed_headers, hnames)
     : string_copy(hnames);


@@ -1262,7 +1142,7 @@ if (log_message != NULL && log_message != user_message)
     int length = Ustrlen(text) + 1;
     log_write(0, LOG_MAIN, "%s", text);
     logged = store_malloc(sizeof(string_item) + length);
     int length = Ustrlen(text) + 1;
     log_write(0, LOG_MAIN, "%s", text);
     logged = store_malloc(sizeof(string_item) + length);

-    logged->text = (uschar *)logged + sizeof(string_item);
+    logged->text = US logged + sizeof(string_item);

     memcpy(logged->text, text, length);
     logged->next = acl_warn_logged;
     acl_warn_logged = logged;
     memcpy(logged->text, text, length);
     logged->next = acl_warn_logged;
     acl_warn_logged = logged;


@@ -1332,7 +1212,7 @@ if (host_lookup_failed)
 /* Need to do a lookup */
 
 HDEBUG(D_acl)
 /* Need to do a lookup */
 
 HDEBUG(D_acl)

-  debug_printf("looking up host name to force name/address consistency check\n");
+  debug_printf_indent("looking up host name to force name/address consistency check\n");

 
 if ((rc = host_name_lookup()) != OK)
   {
 
 if ((rc = host_name_lookup()) != OK)
   {


@@ -1366,7 +1246,7 @@ an odd configuration - why didn't the SRV record have a weight of 1 instead?)
 Arguments:
   dnsa       the DNS answer block
   dnss       a DNS scan block for us to use
 Arguments:
   dnsa       the DNS answer block
   dnss       a DNS scan block for us to use

-  reset      option specifing what portion to scan, as described above
+  reset      option specifying what portion to scan, as described above

   target     the target hostname to use for matching RR names
 
 Returns:     CSA_OK             successfully authorized
   target     the target hostname to use for matching RR names
 
 Returns:     CSA_OK             successfully authorized


@@ -1406,7 +1286,7 @@ for (rr = dns_next_rr(dnsa, dnss, reset);
     {
     /* If the client IP address matches the target IP address, it's good! */
 
     {
     /* If the client IP address matches the target IP address, it's good! */
 

-    DEBUG(D_acl) debug_printf("CSA target address is %s\n", da->address);
+    DEBUG(D_acl) debug_printf_indent("CSA target address is %s\n", da->address);

 
     if (strcmpic(sender_host_address, da->address) == 0) return CSA_OK;
     }
 
     if (strcmpic(sender_host_address, da->address) == 0) return CSA_OK;
     }


@@ -1448,7 +1328,6 @@ acl_verify_csa(const uschar *domain)
 {
 tree_node *t;
 const uschar *found;
 {
 tree_node *t;
 const uschar *found;

-uschar *p;

 int priority, weight, port;
 dns_answer dnsa;
 dns_scan dnss;
 int priority, weight, port;
 dns_answer dnsa;
 dns_scan dnss;


@@ -1526,20 +1405,19 @@ switch (dns_special_lookup(&dnsa, domain, T_CSA, &found))
 /* Scan the reply for well-formed CSA SRV records. */
 
 for (rr = dns_next_rr(&dnsa, &dnss, RESET_ANSWERS);
 /* Scan the reply for well-formed CSA SRV records. */
 
 for (rr = dns_next_rr(&dnsa, &dnss, RESET_ANSWERS);

-     rr != NULL;
-     rr = dns_next_rr(&dnsa, &dnss, RESET_NEXT))
+     rr;
+     rr = dns_next_rr(&dnsa, &dnss, RESET_NEXT)) if (rr->type == T_SRV)

   {
   {

-  if (rr->type != T_SRV) continue;
+  const uschar * p = rr->data;

 
   /* Extract the numerical SRV fields (p is incremented) */
 
 
   /* Extract the numerical SRV fields (p is incremented) */
 

-  p = rr->data;

   GETSHORT(priority, p);
   GETSHORT(weight, p);
   GETSHORT(port, p);
 
   DEBUG(D_acl)
   GETSHORT(priority, p);
   GETSHORT(weight, p);
   GETSHORT(port, p);
 
   DEBUG(D_acl)

-    debug_printf("CSA priority=%d weight=%d port=%d\n", priority, weight, port);
+    debug_printf_indent("CSA priority=%d weight=%d port=%d\n", priority, weight, port);

 
   /* Check the CSA version number */
 
 
   /* Check the CSA version number */
 


@@ -1552,12 +1430,7 @@ for (rr = dns_next_rr(&dnsa, &dnss, RESET_ANSWERS);
   SRV records of their own. */
 
   if (Ustrcmp(found, domain) != 0)
   SRV records of their own. */
 
   if (Ustrcmp(found, domain) != 0)

-    {
-    if (port & 1)
-      return t->data.val = CSA_FAIL_EXPLICIT;
-    else
-      return t->data.val = CSA_UNKNOWN;
-    }
+    return t->data.val = port & 1 ? CSA_FAIL_EXPLICIT : CSA_UNKNOWN;

 
   /* This CSA SRV record refers directly to our domain, so we check the value
   in the weight field to work out the domain's authorization. 0 and 1 are
 
   /* This CSA SRV record refers directly to our domain, so we check the value
   in the weight field to work out the domain's authorization. 0 and 1 are


@@ -1576,7 +1449,7 @@ for (rr = dns_next_rr(&dnsa, &dnss, RESET_ANSWERS);
   (void)dn_expand(dnsa.answer, dnsa.answer + dnsa.answerlen, p,
     (DN_EXPAND_ARG4_TYPE)target, sizeof(target));
 
   (void)dn_expand(dnsa.answer, dnsa.answer + dnsa.answerlen, p,
     (DN_EXPAND_ARG4_TYPE)target, sizeof(target));
 

-  DEBUG(D_acl) debug_printf("CSA target is %s\n", target);
+  DEBUG(D_acl) debug_printf_indent("CSA target is %s\n", target);

 
   break;
   }
 
   break;
   }


@@ -1644,7 +1517,7 @@ switch (dns_lookup(&dnsa, target, type, NULL))
 
 enum { VERIFY_REV_HOST_LKUP, VERIFY_CERT, VERIFY_HELO, VERIFY_CSA, VERIFY_HDR_SYNTAX,
        VERIFY_NOT_BLIND, VERIFY_HDR_SNDR, VERIFY_SNDR, VERIFY_RCPT,
 
 enum { VERIFY_REV_HOST_LKUP, VERIFY_CERT, VERIFY_HELO, VERIFY_CSA, VERIFY_HDR_SYNTAX,
        VERIFY_NOT_BLIND, VERIFY_HDR_SNDR, VERIFY_SNDR, VERIFY_RCPT,

-       VERIFY_HDR_NAMES_ASCII
+       VERIFY_HDR_NAMES_ASCII, VERIFY_ARC

   };
 typedef struct {
   uschar * name;
   };
 typedef struct {
   uschar * name;


@@ -1654,25 +1527,29 @@ typedef struct {
   unsigned alt_opt_sep;                /* >0 Non-/ option separator (custom parser) */
   } verify_type_t;
 static verify_type_t verify_type_list[] = {
   unsigned alt_opt_sep;                /* >0 Non-/ option separator (custom parser) */
   } verify_type_t;
 static verify_type_t verify_type_list[] = {

+    /* name                    value                   where   no-opt opt-sep */

     { US"reverse_host_lookup", VERIFY_REV_HOST_LKUP,   ~0,     FALSE, 0 },
     { US"reverse_host_lookup", VERIFY_REV_HOST_LKUP,   ~0,     FALSE, 0 },

-    { US"certificate",         VERIFY_CERT,            ~0,     TRUE, 0 },
-    { US"helo",                        VERIFY_HELO,            ~0,     TRUE, 0 },
+    { US"certificate",         VERIFY_CERT,            ~0,     TRUE,  0 },
+    { US"helo",                        VERIFY_HELO,            ~0,     TRUE,  0 },

     { US"csa",                 VERIFY_CSA,             ~0,     FALSE, 0 },
     { US"csa",                 VERIFY_CSA,             ~0,     FALSE, 0 },

-    { US"header_syntax",       VERIFY_HDR_SYNTAX,      (1<<ACL_WHERE_DATA)|(1<<ACL_WHERE_NOTSMTP), TRUE, 0 },
-    { US"not_blind",           VERIFY_NOT_BLIND,       (1<<ACL_WHERE_DATA)|(1<<ACL_WHERE_NOTSMTP), TRUE, 0 },
-    { US"header_sender",       VERIFY_HDR_SNDR,        (1<<ACL_WHERE_DATA)|(1<<ACL_WHERE_NOTSMTP), FALSE, 0 },
-    { US"sender",              VERIFY_SNDR,            (1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)
-                       |(1<<ACL_WHERE_PREDATA)|(1<<ACL_WHERE_DATA)|(1<<ACL_WHERE_NOTSMTP),
+    { US"header_syntax",       VERIFY_HDR_SYNTAX,      ACL_BIT_DATA | ACL_BIT_NOTSMTP, TRUE, 0 },
+    { US"not_blind",           VERIFY_NOT_BLIND,       ACL_BIT_DATA | ACL_BIT_NOTSMTP, TRUE, 0 },
+    { US"header_sender",       VERIFY_HDR_SNDR,        ACL_BIT_DATA | ACL_BIT_NOTSMTP, FALSE, 0 },
+    { US"sender",              VERIFY_SNDR,            ACL_BIT_MAIL | ACL_BIT_RCPT
+                       |ACL_BIT_PREDATA | ACL_BIT_DATA | ACL_BIT_NOTSMTP,

                                                                                FALSE, 6 },
                                                                                FALSE, 6 },

-    { US"recipient",           VERIFY_RCPT,            (1<<ACL_WHERE_RCPT),    FALSE, 0 },
-    { US"header_names_ascii",  VERIFY_HDR_NAMES_ASCII, (1<<ACL_WHERE_DATA)|(1<<ACL_WHERE_NOTSMTP), TRUE, 0 }
+    { US"recipient",           VERIFY_RCPT,            ACL_BIT_RCPT,   FALSE, 0 },
+    { US"header_names_ascii",  VERIFY_HDR_NAMES_ASCII, ACL_BIT_DATA | ACL_BIT_NOTSMTP, TRUE, 0 },
+#ifdef EXPERIMENTAL_ARC
+    { US"arc",                 VERIFY_ARC,             ACL_BIT_DATA,   FALSE , 0 },
+#endif

   };
 
 
 enum { CALLOUT_DEFER_OK, CALLOUT_NOCACHE, CALLOUT_RANDOM, CALLOUT_USE_SENDER,
   CALLOUT_USE_POSTMASTER, CALLOUT_POSTMASTER, CALLOUT_FULLPOSTMASTER,
   CALLOUT_MAILFROM, CALLOUT_POSTMASTER_MAILFROM, CALLOUT_MAXWAIT, CALLOUT_CONNECT,
   };
 
 
 enum { CALLOUT_DEFER_OK, CALLOUT_NOCACHE, CALLOUT_RANDOM, CALLOUT_USE_SENDER,
   CALLOUT_USE_POSTMASTER, CALLOUT_POSTMASTER, CALLOUT_FULLPOSTMASTER,
   CALLOUT_MAILFROM, CALLOUT_POSTMASTER_MAILFROM, CALLOUT_MAXWAIT, CALLOUT_CONNECT,

-  CALLOUT_TIME
+  CALLOUT_HOLD, CALLOUT_TIME   /* TIME must be last */

   };
 typedef struct {
   uschar * name;
   };
 typedef struct {
   uschar * name;


@@ -1682,6 +1559,7 @@ typedef struct {
   BOOL     timeval;    /* Has a time value */
   } callout_opt_t;
 static callout_opt_t callout_opt_list[] = {
   BOOL     timeval;    /* Has a time value */
   } callout_opt_t;
 static callout_opt_t callout_opt_list[] = {

+    /* name                    value                   flag            has-opt         has-time */

     { US"defer_ok",      CALLOUT_DEFER_OK,      0,                             FALSE, FALSE },
     { US"no_cache",      CALLOUT_NOCACHE,       vopt_callout_no_cache,         FALSE, FALSE },
     { US"random",        CALLOUT_RANDOM,        vopt_callout_random,           FALSE, FALSE },
     { US"defer_ok",      CALLOUT_DEFER_OK,      0,                             FALSE, FALSE },
     { US"no_cache",      CALLOUT_NOCACHE,       vopt_callout_no_cache,         FALSE, FALSE },
     { US"random",        CALLOUT_RANDOM,        vopt_callout_random,           FALSE, FALSE },


@@ -1693,6 +1571,7 @@ static callout_opt_t callout_opt_list[] = {
     { US"mailfrom",      CALLOUT_MAILFROM,      0,                             TRUE,  FALSE },
     { US"maxwait",       CALLOUT_MAXWAIT,       0,                             TRUE,  TRUE },
     { US"connect",       CALLOUT_CONNECT,       0,                             TRUE,  TRUE },
     { US"mailfrom",      CALLOUT_MAILFROM,      0,                             TRUE,  FALSE },
     { US"maxwait",       CALLOUT_MAXWAIT,       0,                             TRUE,  TRUE },
     { US"connect",       CALLOUT_CONNECT,       0,                             TRUE,  TRUE },

+    { US"hold",                  CALLOUT_HOLD,          vopt_callout_hold,             FALSE, FALSE },

     { NULL,              CALLOUT_TIME,          0,                             FALSE, TRUE }
   };
 
     { NULL,              CALLOUT_TIME,          0,                             FALSE, TRUE }
   };
 


@@ -1746,37 +1625,38 @@ const uschar *list = arg;
 uschar *ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size);
 verify_type_t * vp;
 
 uschar *ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size);
 verify_type_t * vp;
 

-if (ss == NULL) goto BAD_VERIFY;
+if (!ss) goto BAD_VERIFY;

 
 /* Handle name/address consistency verification in a separate function. */
 
 for (vp= verify_type_list;
 
 /* Handle name/address consistency verification in a separate function. */
 
 for (vp= verify_type_list;

-     (char *)vp < (char *)verify_type_list + sizeof(verify_type_list);
+     CS vp < CS verify_type_list + sizeof(verify_type_list);

      vp++
     )
   if (vp->alt_opt_sep ? strncmpic(ss, vp->name, vp->alt_opt_sep) == 0
                       : strcmpic (ss, vp->name) == 0)
    break;
      vp++
     )
   if (vp->alt_opt_sep ? strncmpic(ss, vp->name, vp->alt_opt_sep) == 0
                       : strcmpic (ss, vp->name) == 0)
    break;

-if ((char *)vp >= (char *)verify_type_list + sizeof(verify_type_list))
+if (CS vp >= CS verify_type_list + sizeof(verify_type_list))

   goto BAD_VERIFY;
 
   goto BAD_VERIFY;
 

-if (vp->no_options && slash != NULL)
+if (vp->no_options && slash)

   {
   *log_msgptr = string_sprintf("unexpected '/' found in \"%s\" "
     "(this verify item has no options)", arg);
   return ERROR;
   }
   {
   *log_msgptr = string_sprintf("unexpected '/' found in \"%s\" "
     "(this verify item has no options)", arg);
   return ERROR;
   }

-if (!(vp->where_allowed & (1<<where)))
+if (!(vp->where_allowed & BIT(where)))

   {
   {

-  *log_msgptr = string_sprintf("cannot verify %s in ACL for %s", vp->name, acl_wherenames[where]);
+  *log_msgptr = string_sprintf("cannot verify %s in ACL for %s",
+                 vp->name, acl_wherenames[where]);

   return ERROR;
   }
 switch(vp->value)
   {
   case VERIFY_REV_HOST_LKUP:
   return ERROR;
   }
 switch(vp->value)
   {
   case VERIFY_REV_HOST_LKUP:

-    if (sender_host_address == NULL) return OK;
+    if (!sender_host_address) return OK;

     if ((rc = acl_verify_reverse(user_msgptr, log_msgptr)) == DEFER)
     if ((rc = acl_verify_reverse(user_msgptr, log_msgptr)) == DEFER)

-      while ((ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size)))
+      while ((ss = string_nextinlist(&list, &sep, NULL, 0)))

        if (strcmpic(ss, US"defer_ok") == 0)
          return OK;
     return rc;
        if (strcmpic(ss, US"defer_ok") == 0)
          return OK;
     return rc;


@@ -1794,8 +1674,8 @@ switch(vp->value)
     /* We can test the result of optional HELO verification that might have
     occurred earlier. If not, we can attempt the verification now. */
 
     /* We can test the result of optional HELO verification that might have
     occurred earlier. If not, we can attempt the verification now. */
 

-    if (!helo_verified && !helo_verify_failed) smtp_verify_helo();
-    return helo_verified? OK : FAIL;
+    if (!f.helo_verified && !f.helo_verify_failed) smtp_verify_helo();
+    return f.helo_verified ? OK : FAIL;

 
   case VERIFY_CSA:
     /* Do Client SMTP Authorization checks in a separate function, and turn the
 
   case VERIFY_CSA:
     /* Do Client SMTP Authorization checks in a separate function, and turn the


@@ -1805,11 +1685,29 @@ switch(vp->value)
     *log_msgptr = *user_msgptr = string_sprintf("client SMTP authorization %s",
                                               csa_reason_string[rc]);
     csa_status = csa_status_string[rc];
     *log_msgptr = *user_msgptr = string_sprintf("client SMTP authorization %s",
                                               csa_reason_string[rc]);
     csa_status = csa_status_string[rc];

-    DEBUG(D_acl) debug_printf("CSA result %s\n", csa_status);
+    DEBUG(D_acl) debug_printf_indent("CSA result %s\n", csa_status);

     return csa_return_code[rc];
 
     return csa_return_code[rc];
 

+#ifdef EXPERIMENTAL_ARC
+  case VERIFY_ARC:
+    {  /* Do Authenticated Received Chain checks in a separate function. */
+    const uschar * condlist = CUS string_nextinlist(&list, &sep, NULL, 0);
+    int csep = 0;
+    uschar * cond;
+
+    if (!(arc_state = acl_verify_arc())) return DEFER;
+    DEBUG(D_acl) debug_printf_indent("ARC verify result %s %s%s%s\n", arc_state,
+      arc_state_reason ? "(":"", arc_state_reason, arc_state_reason ? ")":"");
+
+    if (!condlist) condlist = US"none:pass";
+    while ((cond = string_nextinlist(&condlist, &csep, NULL, 0)))
+      if (Ustrcmp(arc_state, cond) == 0) return OK;
+    return FAIL;
+    }
+#endif
+

   case VERIFY_HDR_SYNTAX:
   case VERIFY_HDR_SYNTAX:

-    /* Check that all relevant header lines have the correct syntax. If there is
+    /* Check that all relevant header lines have the correct 5322-syntax. If there is

     a syntax error, we return details of the error to the sender if configured to
     send out full details. (But a "message" setting on the ACL can override, as
     always). */
     a syntax error, we return details of the error to the sender if configured to
     send out full details. (But a "message" setting on the ACL can override, as
     always). */


@@ -1827,7 +1725,7 @@ switch(vp->value)
     See RFC 5322, 2.2. and RFC 6532, 3. */
 
     rc = verify_check_header_names_ascii(log_msgptr);
     See RFC 5322, 2.2. and RFC 6532, 3. */
 
     rc = verify_check_header_names_ascii(log_msgptr);

-    if (rc != OK && smtp_return_error_details && *log_msgptr != NULL)
+    if (rc != OK && smtp_return_error_details && *log_msgptr)

       *user_msgptr = string_sprintf("Rejected after DATA: %s", *log_msgptr);
     return rc;
 
       *user_msgptr = string_sprintf("Rejected after DATA: %s", *log_msgptr);
     return rc;
 


@@ -1835,8 +1733,7 @@ switch(vp->value)
     /* Check that no recipient of this message is "blind", that is, every envelope
     recipient must be mentioned in either To: or Cc:. */
 
     /* Check that no recipient of this message is "blind", that is, every envelope
     recipient must be mentioned in either To: or Cc:. */
 

-    rc = verify_check_notblind();
-    if (rc != OK)
+    if ((rc = verify_check_notblind()) != OK)

       {
       *log_msgptr = string_sprintf("bcc recipient detected");
       if (smtp_return_error_details)
       {
       *log_msgptr = string_sprintf("bcc recipient detected");
       if (smtp_return_error_details)


@@ -1916,8 +1813,7 @@ while ((ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size))
         uschar buffer[256];
         while (isspace(*sublist)) sublist++;
 
         uschar buffer[256];
         while (isspace(*sublist)) sublist++;
 

-        while ((opt = string_nextinlist(&sublist, &optsep, buffer, sizeof(buffer)))
-              != NULL)
+        while ((opt = string_nextinlist(&sublist, &optsep, buffer, sizeof(buffer))))

           {
          callout_opt_t * op;
          double period = 1.0F;
           {
          callout_opt_t * op;
          double period = 1.0F;


@@ -1939,15 +1835,11 @@ while ((ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size))
               }
             while (isspace(*opt)) opt++;
            }
               }
             while (isspace(*opt)) opt++;
            }

-         if (op->timeval)
+         if (op->timeval && (period = readconf_readtime(opt, 0, FALSE)) < 0)

            {
            {

-            period = readconf_readtime(opt, 0, FALSE);
-            if (period < 0)
-              {
-              *log_msgptr = string_sprintf("bad time value in ACL condition "
-                "\"verify %s\"", arg);
-              return ERROR;
-              }
+           *log_msgptr = string_sprintf("bad time value in ACL condition "
+             "\"verify %s\"", arg);
+           return ERROR;

            }
 
          switch(op->value)
            }
 
          switch(op->value)


@@ -2005,17 +1897,17 @@ message if giving out verification details. */
 if (verify_header_sender)
   {
   int verrno;
 if (verify_header_sender)
   {
   int verrno;

-  rc = verify_check_header_address(user_msgptr, log_msgptr, callout,
+
+  if ((rc = verify_check_header_address(user_msgptr, log_msgptr, callout,

     callout_overall, callout_connect, se_mailfrom, pm_mailfrom, verify_options,
     callout_overall, callout_connect, se_mailfrom, pm_mailfrom, verify_options,

-    &verrno);
-  if (rc != OK)
+    &verrno)) != OK)

     {
     *basic_errno = verrno;
     if (smtp_return_error_details)
       {
     {
     *basic_errno = verrno;
     if (smtp_return_error_details)
       {

-      if (*user_msgptr == NULL && *log_msgptr != NULL)
+      if (!*user_msgptr && *log_msgptr)

         *user_msgptr = string_sprintf("Rejected after DATA: %s", *log_msgptr);
         *user_msgptr = string_sprintf("Rejected after DATA: %s", *log_msgptr);

-      if (rc == DEFER) acl_temp_details = TRUE;
+      if (rc == DEFER) f.acl_temp_details = TRUE;

       }
     }
   }
       }
     }
   }


@@ -2035,10 +1927,9 @@ Therefore, we always do a full sender verify when any kind of callout is
 specified. Caching elsewhere, for instance in the DNS resolver and in the
 callout handling, should ensure that this is not terribly inefficient. */
 
 specified. Caching elsewhere, for instance in the DNS resolver and in the
 callout handling, should ensure that this is not terribly inefficient. */
 

-else if (verify_sender_address != NULL)
+else if (verify_sender_address)

   {
   {

-  if ((verify_options & (vopt_callout_recipsender|vopt_callout_recippmaster))
-       != 0)
+  if ((verify_options & (vopt_callout_recipsender|vopt_callout_recippmaster)))

     {
     *log_msgptr = US"use_sender or use_postmaster cannot be used for a "
       "sender verify callout";
     {
     *log_msgptr = US"use_sender or use_postmaster cannot be used for a "
       "sender verify callout";


@@ -2054,12 +1945,14 @@ else if (verify_sender_address != NULL)
     callout that was done previously). If the "routed" flag is not set, routing
     must have failed, so we use the saved return code. */
 
     callout that was done previously). If the "routed" flag is not set, routing
     must have failed, so we use the saved return code. */
 

-    if (testflag(sender_vaddr, af_verify_routed)) rc = OK; else
+    if (testflag(sender_vaddr, af_verify_routed))
+      rc = OK;
+    else

       {
       rc = sender_vaddr->special_action;
       *basic_errno = sender_vaddr->basic_errno;
       }
       {
       rc = sender_vaddr->special_action;
       *basic_errno = sender_vaddr->basic_errno;
       }

-    HDEBUG(D_acl) debug_printf("using cached sender verify result\n");
+    HDEBUG(D_acl) debug_printf_indent("using cached sender verify result\n");

     }
 
   /* Do a new verification, and cache the result. The cache is used to avoid
     }
 
   /* Do a new verification, and cache the result. The cache is used to avoid


@@ -2106,24 +1999,23 @@ else if (verify_sender_address != NULL)
       rc = verify_address(sender_vaddr, NULL, verify_options, callout,
         callout_overall, callout_connect, se_mailfrom, pm_mailfrom, &routed);
 
       rc = verify_address(sender_vaddr, NULL, verify_options, callout,
         callout_overall, callout_connect, se_mailfrom, pm_mailfrom, &routed);
 

-      HDEBUG(D_acl) debug_printf("----------- end verify ------------\n");
+      HDEBUG(D_acl) debug_printf_indent("----------- end verify ------------\n");

 
 

-      if (rc == OK)
-        {
-        if (Ustrcmp(sender_vaddr->address, verify_sender_address) != 0)
-          {
-          DEBUG(D_acl) debug_printf("sender %s verified ok as %s\n",
-            verify_sender_address, sender_vaddr->address);
-          }
-        else
-          {
-          DEBUG(D_acl) debug_printf("sender %s verified ok\n",
-            verify_sender_address);
-          }
-        }
-      else *basic_errno = sender_vaddr->basic_errno;
+      if (rc != OK)
+        *basic_errno = sender_vaddr->basic_errno;
+      else
+       DEBUG(D_acl)
+         {
+         if (Ustrcmp(sender_vaddr->address, verify_sender_address) != 0)
+           debug_printf_indent("sender %s verified ok as %s\n",
+             verify_sender_address, sender_vaddr->address);
+         else
+           debug_printf_indent("sender %s verified ok\n",
+             verify_sender_address);
+         }

       }
       }

-    else rc = OK;  /* Null sender */
+    else
+      rc = OK;  /* Null sender */

 
     /* Cache the result code */
 
 
     /* Cache the result code */
 


@@ -2160,7 +2052,7 @@ else
   addr2 = *addr;
   rc = verify_address(&addr2, NULL, verify_options|vopt_is_recipient, callout,
     callout_overall, callout_connect, se_mailfrom, pm_mailfrom, NULL);
   addr2 = *addr;
   rc = verify_address(&addr2, NULL, verify_options|vopt_is_recipient, callout,
     callout_overall, callout_connect, se_mailfrom, pm_mailfrom, NULL);

-  HDEBUG(D_acl) debug_printf("----------- end verify ------------\n");
+  HDEBUG(D_acl) debug_printf_indent("----------- end verify ------------\n");

 
   *basic_errno = addr2.basic_errno;
   *log_msgptr = addr2.message;
 
   *basic_errno = addr2.basic_errno;
   *log_msgptr = addr2.message;


@@ -2168,7 +2060,7 @@ else
     addr2.user_message : addr2.message;
 
   /* Allow details for temporary error if the address is so flagged. */
     addr2.user_message : addr2.message;
 
   /* Allow details for temporary error if the address is so flagged. */

-  if (testflag((&addr2), af_pass_message)) acl_temp_details = TRUE;
+  if (testflag((&addr2), af_pass_message)) f.acl_temp_details = TRUE;

 
   /* Make $address_data visible */
   deliver_address_data = addr2.prop.address_data;
 
   /* Make $address_data visible */
   deliver_address_data = addr2.prop.address_data;


@@ -2179,7 +2071,7 @@ else
 if (rc == DEFER && (defer_ok ||
    (callout_defer_ok && *basic_errno == ERRNO_CALLOUTDEFER)))
   {
 if (rc == DEFER && (defer_ok ||
    (callout_defer_ok && *basic_errno == ERRNO_CALLOUTDEFER)))
   {

-  HDEBUG(D_acl) debug_printf("verify defer overridden by %s\n",
+  HDEBUG(D_acl) debug_printf_indent("verify defer overridden by %s\n",

     defer_ok? "defer_ok" : "callout_defer_ok");
   rc = OK;
   }
     defer_ok? "defer_ok" : "callout_defer_ok");
   rc = OK;
   }


@@ -2244,26 +2136,20 @@ Returns:      CONTROL_xxx value
 static int
 decode_control(const uschar *arg, const uschar **pptr, int where, uschar **log_msgptr)
 {
 static int
 decode_control(const uschar *arg, const uschar **pptr, int where, uschar **log_msgptr)
 {

-int len;
-control_def *d;
-
-for (d = controls_list;
-     d < controls_list + sizeof(controls_list)/sizeof(control_def);
-     d++)
-  {
-  len = Ustrlen(d->name);
-  if (Ustrncmp(d->name, arg, len) == 0) break;
-  }
+int idx, len;
+control_def * d;

 
 

-if (d >= controls_list + sizeof(controls_list)/sizeof(control_def) ||
-   (arg[len] != 0 && (!d->has_option || arg[len] != '/')))
+if (  (idx = find_control(arg, controls_list, nelem(controls_list))) < 0
+   || (  arg[len = Ustrlen((d = controls_list+idx)->name)] != 0
+      && (!d->has_option || arg[len] != '/')
+   )  )

   {
   *log_msgptr = string_sprintf("syntax error in \"control=%s\"", arg);
   return CONTROL_ERROR;
   }
 
 *pptr = arg + len;
   {
   *log_msgptr = string_sprintf("syntax error in \"control=%s\"", arg);
   return CONTROL_ERROR;
   }
 
 *pptr = arg + len;

-return d->value;
+return idx;

 }
 
 
 }
 
 


@@ -2353,8 +2239,7 @@ error messages based on rate limits obtained from a table lookup. */
 size, which must be greater than or equal to zero. Zero is useful for
 rate measurement as opposed to rate limiting. */
 
 size, which must be greater than or equal to zero. Zero is useful for
 rate measurement as opposed to rate limiting. */
 

-sender_rate_limit = string_nextinlist(&arg, &sep, NULL, 0);
-if (sender_rate_limit == NULL)
+if (!(sender_rate_limit = string_nextinlist(&arg, &sep, NULL, 0)))

   return ratelimit_error(log_msgptr, "sender rate limit not set");
 
 limit = Ustrtod(sender_rate_limit, &ss);
   return ratelimit_error(log_msgptr, "sender rate limit not set");
 
 limit = Ustrtod(sender_rate_limit, &ss);


@@ -2370,9 +2255,8 @@ if (limit < 0.0 || *ss != '\0')
 constant. This must be strictly greater than zero, because zero leads to
 run-time division errors. */
 
 constant. This must be strictly greater than zero, because zero leads to
 run-time division errors. */
 

-sender_rate_period = string_nextinlist(&arg, &sep, NULL, 0);
-if (sender_rate_period == NULL) period = -1.0;
-else period = readconf_readtime(sender_rate_period, 0, FALSE);
+period = !(sender_rate_period = string_nextinlist(&arg, &sep, NULL, 0))
+  ? -1.0 : readconf_readtime(sender_rate_period, 0, FALSE);

 if (period <= 0.0)
   return ratelimit_error(log_msgptr,
     "\"%s\" is not a time value", sender_rate_period);
 if (period <= 0.0)
   return ratelimit_error(log_msgptr,
     "\"%s\" is not a time value", sender_rate_period);


@@ -2384,8 +2268,7 @@ count = 1.0;
 
 /* Parse the other options. */
 
 
 /* Parse the other options. */
 

-while ((ss = string_nextinlist(&arg, &sep, big_buffer, big_buffer_size))
-       != NULL)
+while ((ss = string_nextinlist(&arg, &sep, big_buffer, big_buffer_size)))

   {
   if (strcmpic(ss, US"leaky") == 0) leaky = TRUE;
   else if (strcmpic(ss, US"strict") == 0) strict = TRUE;
   {
   if (strcmpic(ss, US"leaky") == 0) leaky = TRUE;
   else if (strcmpic(ss, US"strict") == 0) strict = TRUE;


@@ -2418,29 +2301,28 @@ while ((ss = string_nextinlist(&arg, &sep, big_buffer, big_buffer_size))
   else if (strcmpic(ss, US"per_byte") == 0)
     {
     /* If we have not yet received the message data and there was no SIZE
   else if (strcmpic(ss, US"per_byte") == 0)
     {
     /* If we have not yet received the message data and there was no SIZE

-    declaration on the MAIL comand, then it's safe to just use a value of
+    declaration on the MAIL command, then it's safe to just use a value of

     zero and let the recorded rate decay as if nothing happened. */
     RATE_SET(mode, PER_MAIL);
     if (where > ACL_WHERE_NOTSMTP) badacl = TRUE;
     zero and let the recorded rate decay as if nothing happened. */
     RATE_SET(mode, PER_MAIL);
     if (where > ACL_WHERE_NOTSMTP) badacl = TRUE;

-      else count = message_size < 0 ? 0.0 : (double)message_size;
+    else count = message_size < 0 ? 0.0 : (double)message_size;

     }
   else if (strcmpic(ss, US"per_addr") == 0)
     {
     RATE_SET(mode, PER_RCPT);
     if (where != ACL_WHERE_RCPT) badacl = TRUE, unique = US"*";
     }
   else if (strcmpic(ss, US"per_addr") == 0)
     {
     RATE_SET(mode, PER_RCPT);
     if (where != ACL_WHERE_RCPT) badacl = TRUE, unique = US"*";

-      else unique = string_sprintf("%s@%s", deliver_localpart, deliver_domain);
+    else unique = string_sprintf("%s@%s", deliver_localpart, deliver_domain);

     }
   else if (strncmpic(ss, US"count=", 6) == 0)
     {
     uschar *e;
     count = Ustrtod(ss+6, &e);
     if (count < 0.0 || *e != '\0')
     }
   else if (strncmpic(ss, US"count=", 6) == 0)
     {
     uschar *e;
     count = Ustrtod(ss+6, &e);
     if (count < 0.0 || *e != '\0')

-      return ratelimit_error(log_msgptr,
-       "\"%s\" is not a positive number", ss);
+      return ratelimit_error(log_msgptr, "\"%s\" is not a positive number", ss);

     }
   else if (strncmpic(ss, US"unique=", 7) == 0)
     unique = string_copy(ss + 7);
     }
   else if (strncmpic(ss, US"unique=", 7) == 0)
     unique = string_copy(ss + 7);

-  else if (key == NULL)
+  else if (!key)

     key = string_copy(ss);
   else
     key = string_sprintf("%s/%s", key, ss);
     key = string_copy(ss);
   else
     key = string_sprintf("%s/%s", key, ss);


@@ -2456,7 +2338,7 @@ if (leaky + strict + readonly > 1)
   return ratelimit_error(log_msgptr, "conflicting update modes");
 if (badacl && (leaky || strict) && !noupdate)
   return ratelimit_error(log_msgptr,
   return ratelimit_error(log_msgptr, "conflicting update modes");
 if (badacl && (leaky || strict) && !noupdate)
   return ratelimit_error(log_msgptr,

-    "\"%s\" must not have /leaky or /strict option in %s ACL",
+    "\"%s\" must not have /leaky or /strict option, or cannot be used in %s ACL",

     ratelimit_option_string[mode], acl_wherenames[where]);
 
 /* Set the default values of any unset options. In readonly mode we
     ratelimit_option_string[mode], acl_wherenames[where]);
 
 /* Set the default values of any unset options. In readonly mode we


@@ -2474,8 +2356,8 @@ If there is no sender_host_address (e.g. -bs or acl_not_smtp) then we simply
 omit it. The smoothing constant (sender_rate_period) and the per_xxx options
 are added to the key because they alter the meaning of the stored data. */
 
 omit it. The smoothing constant (sender_rate_period) and the per_xxx options
 are added to the key because they alter the meaning of the stored data. */
 

-if (key == NULL)
-  key = (sender_host_address == NULL)? US"" : sender_host_address;
+if (!key)
+  key = !sender_host_address ? US"" : sender_host_address;

 
 key = string_sprintf("%s/%s/%s%s",
   sender_rate_period,
 
 key = string_sprintf("%s/%s/%s%s",
   sender_rate_period,


@@ -2484,7 +2366,7 @@ key = string_sprintf("%s/%s/%s%s",
   key);
 
 HDEBUG(D_acl)
   key);
 
 HDEBUG(D_acl)

-  debug_printf("ratelimit condition count=%.0f %.1f/%s\n", count, limit, key);
+  debug_printf_indent("ratelimit condition count=%.0f %.1f/%s\n", count, limit, key);

 
 /* See if we have already computed the rate by looking in the relevant tree.
 For per-connection rate limiting, store tree nodes and dbdata in the permanent
 
 /* See if we have already computed the rate by looking in the relevant tree.
 For per-connection rate limiting, store tree nodes and dbdata in the permanent


@@ -2496,30 +2378,30 @@ old_pool = store_pool;
 
 if (readonly)
   anchor = &ratelimiters_cmd;
 
 if (readonly)
   anchor = &ratelimiters_cmd;

-else switch(mode) {
-case RATE_PER_CONN:
-  anchor = &ratelimiters_conn;
-  store_pool = POOL_PERM;
-  break;
-case RATE_PER_BYTE:
-case RATE_PER_MAIL:
-case RATE_PER_ALLRCPTS:
-  anchor = &ratelimiters_mail;
-  break;
-case RATE_PER_ADDR:
-case RATE_PER_CMD:
-case RATE_PER_RCPT:
-  anchor = &ratelimiters_cmd;
-  break;
-default:
-  anchor = NULL; /* silence an "unused" complaint */
-  log_write(0, LOG_MAIN|LOG_PANIC_DIE,
-    "internal ACL error: unknown ratelimit mode %d", mode);
-  break;
-}
+else switch(mode)
+  {
+  case RATE_PER_CONN:
+    anchor = &ratelimiters_conn;
+    store_pool = POOL_PERM;
+    break;
+  case RATE_PER_BYTE:
+  case RATE_PER_MAIL:
+  case RATE_PER_ALLRCPTS:
+    anchor = &ratelimiters_mail;
+    break;
+  case RATE_PER_ADDR:
+  case RATE_PER_CMD:
+  case RATE_PER_RCPT:
+    anchor = &ratelimiters_cmd;
+    break;
+  default:
+    anchor = NULL; /* silence an "unused" complaint */
+    log_write(0, LOG_MAIN|LOG_PANIC_DIE,
+      "internal ACL error: unknown ratelimit mode %d", mode);
+    break;
+  }

 
 

-t = tree_search(*anchor, key);
-if (t != NULL)
+if ((t = tree_search(*anchor, key)))

   {
   dbd = t->data.ptr;
   /* The following few lines duplicate some of the code below. */
   {
   dbd = t->data.ptr;
   /* The following few lines duplicate some of the code below. */


@@ -2527,19 +2409,18 @@ if (t != NULL)
   store_pool = old_pool;
   sender_rate = string_sprintf("%.1f", dbd->rate);
   HDEBUG(D_acl)
   store_pool = old_pool;
   sender_rate = string_sprintf("%.1f", dbd->rate);
   HDEBUG(D_acl)

-    debug_printf("ratelimit found pre-computed rate %s\n", sender_rate);
+    debug_printf_indent("ratelimit found pre-computed rate %s\n", sender_rate);

   return rc;
   }
 
 /* We aren't using a pre-computed rate, so get a previously recorded rate
 from the database, which will be updated and written back if required. */
 
   return rc;
   }
 
 /* We aren't using a pre-computed rate, so get a previously recorded rate
 from the database, which will be updated and written back if required. */
 

-dbm = dbfn_open(US"ratelimit", O_RDWR, &dbblock, TRUE);
-if (dbm == NULL)
+if (!(dbm = dbfn_open(US"ratelimit", O_RDWR, &dbblock, TRUE)))

   {
   store_pool = old_pool;
   sender_rate = NULL;
   {
   store_pool = old_pool;
   sender_rate = NULL;

-  HDEBUG(D_acl) debug_printf("ratelimit database not available\n");
+  HDEBUG(D_acl) debug_printf_indent("ratelimit database not available\n");

   *log_msgptr = US"ratelimit database not available";
   return DEFER;
   }
   *log_msgptr = US"ratelimit database not available";
   return DEFER;
   }


@@ -2548,10 +2429,10 @@ dbd = NULL;
 
 gettimeofday(&tv, NULL);
 
 
 gettimeofday(&tv, NULL);
 

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

   {
   /* Locate the basic ratelimit block inside the DB data. */
   {
   /* Locate the basic ratelimit block inside the DB data. */

-  HDEBUG(D_acl) debug_printf("ratelimit found key in database\n");
+  HDEBUG(D_acl) debug_printf_indent("ratelimit found key in database\n");

   dbd = &dbdb->dbd;
 
   /* Forget the old Bloom filter if it is too old, so that we count each
   dbd = &dbdb->dbd;
 
   /* Forget the old Bloom filter if it is too old, so that we count each


@@ -2559,17 +2440,17 @@ if (dbdb != NULL)
   filter because we want its size to change if the limit changes. Note that
   we keep the dbd pointer for copying the rate into the new data block. */
 
   filter because we want its size to change if the limit changes. Note that
   we keep the dbd pointer for copying the rate into the new data block. */
 

-  if(unique != NULL && tv.tv_sec > dbdb->bloom_epoch + period)
+  if(unique && tv.tv_sec > dbdb->bloom_epoch + period)

     {
     {

-    HDEBUG(D_acl) debug_printf("ratelimit discarding old Bloom filter\n");
+    HDEBUG(D_acl) debug_printf_indent("ratelimit discarding old Bloom filter\n");

     dbdb = NULL;
     }
 
   /* Sanity check. */
 
     dbdb = NULL;
     }
 
   /* Sanity check. */
 

-  if(unique != NULL && dbdb_size < sizeof(*dbdb))
+  if(unique && dbdb_size < sizeof(*dbdb))

     {
     {

-    HDEBUG(D_acl) debug_printf("ratelimit discarding undersize Bloom filter\n");
+    HDEBUG(D_acl) debug_printf_indent("ratelimit discarding undersize Bloom filter\n");

     dbdb = NULL;
     }
   }
     dbdb = NULL;
     }
   }


@@ -2577,19 +2458,19 @@ if (dbdb != NULL)
 /* Allocate a new data block if the database lookup failed
 or the Bloom filter passed its age limit. */
 
 /* Allocate a new data block if the database lookup failed
 or the Bloom filter passed its age limit. */
 

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

   {
   {

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

     {
     /* No Bloom filter. This basic ratelimit block is initialized below. */
     {
     /* No Bloom filter. This basic ratelimit block is initialized below. */

-    HDEBUG(D_acl) debug_printf("ratelimit creating new rate data block\n");
+    HDEBUG(D_acl) debug_printf_indent("ratelimit creating new rate data block\n");

     dbdb_size = sizeof(*dbd);
     dbdb = store_get(dbdb_size);
     }
   else
     {
     int extra;
     dbdb_size = sizeof(*dbd);
     dbdb = store_get(dbdb_size);
     }
   else
     {
     int extra;

-    HDEBUG(D_acl) debug_printf("ratelimit creating new Bloom filter\n");
+    HDEBUG(D_acl) debug_printf_indent("ratelimit creating new Bloom filter\n");

 
     /* See the long comment below for an explanation of the magic number 2.
     The filter has a minimum size in case the rate limit is very small;
 
     /* See the long comment below for an explanation of the magic number 2.
     The filter has a minimum size in case the rate limit is very small;


@@ -2606,7 +2487,7 @@ if (dbdb == NULL)
     /* Preserve any basic ratelimit data (which is our longer-term memory)
     by copying it from the discarded block. */
 
     /* Preserve any basic ratelimit data (which is our longer-term memory)
     by copying it from the discarded block. */
 

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

       {
       dbdb->dbd = *dbd;
       dbd = &dbdb->dbd;
       {
       dbdb->dbd = *dbd;
       dbd = &dbdb->dbd;


@@ -2620,7 +2501,7 @@ counted. We skip this code in readonly mode for efficiency, because any
 changes to the filter will be discarded and because count is already set to
 zero. */
 
 changes to the filter will be discarded and because count is already set to
 zero. */
 

-if (unique != NULL && !readonly)
+if (unique && !readonly)

   {
   /* We identify unique events using a Bloom filter. (You can find my
   notes on Bloom filters at http://fanf.livejournal.com/81696.html)
   {
   /* We identify unique events using a Bloom filter. (You can find my
   notes on Bloom filters at http://fanf.livejournal.com/81696.html)


@@ -2673,7 +2554,7 @@ if (unique != NULL && !readonly)
   /* Scan the bits corresponding to this event. A zero bit means we have
   not seen it before. Ensure all bits are set to record this event. */
 
   /* Scan the bits corresponding to this event. A zero bit means we have
   not seen it before. Ensure all bits are set to record this event. */
 

-  HDEBUG(D_acl) debug_printf("ratelimit checking uniqueness of %s\n", unique);
+  HDEBUG(D_acl) debug_printf_indent("ratelimit checking uniqueness of %s\n", unique);

 
   seen = TRUE;
   for (n = 0; n < 8; n++, hash += hinc)
 
   seen = TRUE;
   for (n = 0; n < 8; n++, hash += hinc)


@@ -2691,20 +2572,20 @@ if (unique != NULL && !readonly)
 
   if (seen)
     {
 
   if (seen)
     {

-    HDEBUG(D_acl) debug_printf("ratelimit event found in Bloom filter\n");
+    HDEBUG(D_acl) debug_printf_indent("ratelimit event found in Bloom filter\n");

     count = 0.0;
     }
   else
     count = 0.0;
     }
   else

-    HDEBUG(D_acl) debug_printf("ratelimit event added to Bloom filter\n");
+    HDEBUG(D_acl) debug_printf_indent("ratelimit event added to Bloom filter\n");

   }
 
 /* If there was no previous ratelimit data block for this key, initialize
 the new one, otherwise update the block from the database. The initial rate
 is what would be computed by the code below for an infinite interval. */
 
   }
 
 /* If there was no previous ratelimit data block for this key, initialize
 the new one, otherwise update the block from the database. The initial rate
 is what would be computed by the code below for an infinite interval. */
 

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

   {
   {

-  HDEBUG(D_acl) debug_printf("ratelimit initializing new key's rate data\n");
+  HDEBUG(D_acl) debug_printf_indent("ratelimit initializing new key's rate data\n");

   dbd = &dbdb->dbd;
   dbd->time_stamp = tv.tv_sec;
   dbd->time_usec = tv.tv_usec;
   dbd = &dbdb->dbd;
   dbd->time_stamp = tv.tv_sec;
   dbd->time_usec = tv.tv_usec;


@@ -2784,7 +2665,7 @@ else
   size of the event per the period size, ignoring the lack of events outside
   the current period and regardless of where the event falls in the period. So,
   if the interval was so long that the calculated rate is unhelpfully small, we
   size of the event per the period size, ignoring the lack of events outside
   the current period and regardless of where the event falls in the period. So,
   if the interval was so long that the calculated rate is unhelpfully small, we

-  re-intialize the rate. In the absence of higher-rate bursts, the condition
+  re-initialize the rate. In the absence of higher-rate bursts, the condition

   below is true if the interval is greater than the period. */
 
   if (dbd->rate < count) dbd->rate = count;
   below is true if the interval is greater than the period. */
 
   if (dbd->rate < count) dbd->rate = count;


@@ -2794,7 +2675,7 @@ else
 This matters for edge cases such as a limit of zero, when the client
 should be completely blocked. */
 
 This matters for edge cases such as a limit of zero, when the client
 should be completely blocked. */
 

-rc = (dbd->rate < limit)? FAIL : OK;
+rc = dbd->rate < limit ? FAIL : OK;

 
 /* Update the state if the rate is low or if we are being strict. If we
 are in leaky mode and the sender's rate is too high, we do not update
 
 /* Update the state if the rate is low or if we are being strict. If we
 are in leaky mode and the sender's rate is too high, we do not update


@@ -2805,11 +2686,11 @@ neither leaky nor strict are set, so we do not do any updates. */
 if ((rc == FAIL && leaky) || strict)
   {
   dbfn_write(dbm, key, dbdb, dbdb_size);
 if ((rc == FAIL && leaky) || strict)
   {
   dbfn_write(dbm, key, dbdb, dbdb_size);

-  HDEBUG(D_acl) debug_printf("ratelimit db updated\n");
+  HDEBUG(D_acl) debug_printf_indent("ratelimit db updated\n");

   }
 else
   {
   }
 else
   {

-  HDEBUG(D_acl) debug_printf("ratelimit db not updated: %s\n",
+  HDEBUG(D_acl) debug_printf_indent("ratelimit db not updated: %s\n",

     readonly? "readonly mode" : "over the limit, but leaky");
   }
 
     readonly? "readonly mode" : "over the limit, but leaky");
   }
 


@@ -2829,7 +2710,7 @@ store_pool = old_pool;
 sender_rate = string_sprintf("%.1f", dbd->rate);
 
 HDEBUG(D_acl)
 sender_rate = string_sprintf("%.1f", dbd->rate);
 
 HDEBUG(D_acl)

-  debug_printf("ratelimit computed rate %s\n", sender_rate);
+  debug_printf_indent("ratelimit computed rate %s\n", sender_rate);

 
 return rc;
 }
 
 return rc;
 }


@@ -2867,17 +2748,17 @@ uschar * errstr;
 hostname = string_nextinlist(&arg, &sep, NULL, 0);
 portstr = string_nextinlist(&arg, &sep, NULL, 0);
 
 hostname = string_nextinlist(&arg, &sep, NULL, 0);
 portstr = string_nextinlist(&arg, &sep, NULL, 0);
 

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

   {
   *log_msgptr = US"missing destination host in \"udpsend\" modifier";
   return ERROR;
   }
   {
   *log_msgptr = US"missing destination host in \"udpsend\" modifier";
   return ERROR;
   }

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

   {
   *log_msgptr = US"missing destination port in \"udpsend\" modifier";
   return ERROR;
   }
   {
   *log_msgptr = US"missing destination port in \"udpsend\" modifier";
   return ERROR;
   }

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

   {
   *log_msgptr = US"missing datagram payload in \"udpsend\" modifier";
   return ERROR;
   {
   *log_msgptr = US"missing datagram payload in \"udpsend\" modifier";
   return ERROR;


@@ -2907,10 +2788,11 @@ if (r == HOST_FIND_FAILED || r == HOST_FIND_AGAIN)
   }
 
 HDEBUG(D_acl)
   }
 
 HDEBUG(D_acl)

-  debug_printf("udpsend [%s]:%d %s\n", h->address, portnum, arg);
+  debug_printf_indent("udpsend [%s]:%d %s\n", h->address, portnum, arg);

 
 

+/*XXX this could better use sendto */

 r = s = ip_connectedsocket(SOCK_DGRAM, h->address, portnum, portnum,
 r = s = ip_connectedsocket(SOCK_DGRAM, h->address, portnum, portnum,

-               1, NULL, &errstr);
+               1, NULL, &errstr, NULL);

 if (r < 0) goto defer;
 len = Ustrlen(arg);
 r = send(s, arg, len, 0);
 if (r < 0) goto defer;
 len = Ustrlen(arg);
 r = send(s, arg, len, 0);


@@ -2929,7 +2811,7 @@ if (r < len)
   }
 
 HDEBUG(D_acl)
   }
 
 HDEBUG(D_acl)

-  debug_printf("udpsend %d bytes\n", r);
+  debug_printf_indent("udpsend %d bytes\n", r);

 
 return OK;
 
 
 return OK;
 


@@ -2976,14 +2858,12 @@ acl_check_condition(int verb, acl_condition_block *cb, int where,
 {
 uschar *user_message = NULL;
 uschar *log_message = NULL;
 {
 uschar *user_message = NULL;
 uschar *log_message = NULL;

-uschar *debug_tag = NULL;
-uschar *debug_opts = NULL;

 int rc = OK;
 #ifdef WITH_CONTENT_SCAN
 int sep = -'/';
 #endif
 
 int rc = OK;
 #ifdef WITH_CONTENT_SCAN
 int sep = -'/';
 #endif
 

-for (; cb != NULL; cb = cb->next)
+for (; cb; cb = cb->next)

   {
   const uschar *arg;
   int control_type;
   {
   const uschar *arg;
   int control_type;


@@ -2993,14 +2873,14 @@ for (; cb != NULL; cb = cb->next)
 
   if (cb->type == ACLC_MESSAGE)
     {
 
   if (cb->type == ACLC_MESSAGE)
     {

-    HDEBUG(D_acl) debug_printf("  message: %s\n", cb->arg);
+    HDEBUG(D_acl) debug_printf_indent("  message: %s\n", cb->arg);

     user_message = cb->arg;
     continue;
     }
 
   if (cb->type == ACLC_LOG_MESSAGE)
     {
     user_message = cb->arg;
     continue;
     }
 
   if (cb->type == ACLC_LOG_MESSAGE)
     {

-    HDEBUG(D_acl) debug_printf("l_message: %s\n", cb->arg);
+    HDEBUG(D_acl) debug_printf_indent("l_message: %s\n", cb->arg);

     log_message = cb->arg;
     continue;
     }
     log_message = cb->arg;
     continue;
     }


@@ -3018,32 +2898,40 @@ for (; cb != NULL; cb = cb->next)
   of them, but not for all, because expansion happens down in some lower level
   checking functions in some cases. */
 
   of them, but not for all, because expansion happens down in some lower level
   checking functions in some cases. */
 

-  if (cond_expand_at_top[cb->type])
+  if (!conditions[cb->type].expand_at_top)
+    arg = cb->arg;
+  else if (!(arg = expand_string(cb->arg)))

     {
     {

-    arg = expand_string(cb->arg);
-    if (arg == NULL)
-      {
-      if (expand_string_forcedfail) continue;
-      *log_msgptr = string_sprintf("failed to expand ACL string \"%s\": %s",
-        cb->arg, expand_string_message);
-      return search_find_defer? DEFER : ERROR;
-      }
+    if (f.expand_string_forcedfail) continue;
+    *log_msgptr = string_sprintf("failed to expand ACL string \"%s\": %s",
+      cb->arg, expand_string_message);
+    return f.search_find_defer ? DEFER : ERROR;

     }
     }

-  else arg = cb->arg;

 
   /* Show condition, and expanded condition if it's different */
 
   HDEBUG(D_acl)
     {
     int lhswidth = 0;
 
   /* Show condition, and expanded condition if it's different */
 
   HDEBUG(D_acl)
     {
     int lhswidth = 0;

-    debug_printf("check %s%s %n",
-      (!cond_modifiers[cb->type] && cb->u.negated)? "!":"",
-      conditions[cb->type], &lhswidth);
+    debug_printf_indent("check %s%s %n",
+      (!conditions[cb->type].is_modifier && cb->u.negated)? "!":"",
+      conditions[cb->type].name, &lhswidth);

 
     if (cb->type == ACLC_SET)
       {
 
     if (cb->type == ACLC_SET)
       {

-      debug_printf("acl_%s ", cb->u.varname);
-      lhswidth += 5 + Ustrlen(cb->u.varname);
+#ifndef DISABLE_DKIM
+      if (  Ustrcmp(cb->u.varname, "dkim_verify_status") == 0
+        || Ustrcmp(cb->u.varname, "dkim_verify_reason") == 0)
+       {
+       debug_printf("%s ", cb->u.varname);
+       lhswidth += 19;
+       }
+      else
+#endif
+       {
+       debug_printf("acl_%s ", cb->u.varname);
+       lhswidth += 5 + Ustrlen(cb->u.varname);
+       }

       }
 
     debug_printf("= %s\n", cb->arg);
       }
 
     debug_printf("= %s\n", cb->arg);


@@ -3055,11 +2943,11 @@ for (; cb != NULL; cb = cb->next)
 
   /* Check that this condition makes sense at this time */
 
 
   /* Check that this condition makes sense at this time */
 

-  if ((cond_forbids[cb->type] & (1 << where)) != 0)
+  if ((conditions[cb->type].forbids & (1 << where)) != 0)

     {
     *log_msgptr = string_sprintf("cannot %s %s condition in %s ACL",
     {
     *log_msgptr = string_sprintf("cannot %s %s condition in %s ACL",

-      cond_modifiers[cb->type]? "use" : "test",
-      conditions[cb->type], acl_wherenames[where]);
+      conditions[cb->type].is_modifier ? "use" : "test",
+      conditions[cb->type].name, acl_wherenames[where]);

     return ERROR;
     }
 
     return ERROR;
     }
 


@@ -3076,7 +2964,7 @@ for (; cb != NULL; cb = cb->next)
     "discard" verb. */
 
     case ACLC_ACL:
     "discard" verb. */
 
     case ACLC_ACL:

-      rc = acl_check_wargs(where, addr, arg, level+1, user_msgptr, log_msgptr);
+      rc = acl_check_wargs(where, addr, arg, user_msgptr, log_msgptr);

       if (rc == DISCARD && verb != ACL_ACCEPT && verb != ACL_DISCARD)
         {
         *log_msgptr = string_sprintf("nested ACL returned \"discard\" for "
       if (rc == DISCARD && verb != ACL_ACCEPT && verb != ACL_DISCARD)
         {
         *log_msgptr = string_sprintf("nested ACL returned \"discard\" for "


@@ -3087,9 +2975,8 @@ for (; cb != NULL; cb = cb->next)
     break;
 
     case ACLC_AUTHENTICATED:
     break;
 
     case ACLC_AUTHENTICATED:

-    rc = (sender_host_authenticated == NULL)? FAIL :
-      match_isinlist(sender_host_authenticated, &arg, 0, NULL, NULL, MCL_STRING,
-        TRUE, NULL);
+      rc = sender_host_authenticated ? match_isinlist(sender_host_authenticated,
+             &arg, 0, NULL, NULL, MCL_STRING, TRUE, NULL) : FAIL;

     break;
 
     #ifdef EXPERIMENTAL_BRIGHTMAIL
     break;
 
     #ifdef EXPERIMENTAL_BRIGHTMAIL


@@ -3130,17 +3017,17 @@ for (; cb != NULL; cb = cb->next)
 
       /* Check if this control makes sense at this time */
 
 
       /* Check if this control makes sense at this time */
 

-      if ((control_forbids[control_type] & (1 << where)) != 0)
+      if (controls_list[control_type].forbids & (1 << where))

        {
        *log_msgptr = string_sprintf("cannot use \"control=%s\" in %s ACL",
        {
        *log_msgptr = string_sprintf("cannot use \"control=%s\" in %s ACL",

-         controls[control_type], acl_wherenames[where]);
+         controls_list[control_type].name, acl_wherenames[where]);

        return ERROR;
        }
 
       switch(control_type)
        {
        case CONTROL_AUTH_UNADVERTISED:
        return ERROR;
        }
 
       switch(control_type)
        {
        case CONTROL_AUTH_UNADVERTISED:

-       allow_auth_unadvertised = TRUE;
+       f.allow_auth_unadvertised = TRUE;

        break;
 
        #ifdef EXPERIMENTAL_BRIGHTMAIL
        break;
 
        #ifdef EXPERIMENTAL_BRIGHTMAIL


@@ -3151,22 +3038,22 @@ for (; cb != NULL; cb = cb->next)
 
        #ifndef DISABLE_DKIM
        case CONTROL_DKIM_VERIFY:
 
        #ifndef DISABLE_DKIM
        case CONTROL_DKIM_VERIFY:

-       dkim_disable_verify = TRUE;
+       f.dkim_disable_verify = TRUE;

        #ifdef EXPERIMENTAL_DMARC
        /* Since DKIM was blocked, skip DMARC too */
        #ifdef EXPERIMENTAL_DMARC
        /* Since DKIM was blocked, skip DMARC too */

-       dmarc_disable_verify = TRUE;
-       dmarc_enable_forensic = FALSE;
+       f.dmarc_disable_verify = TRUE;
+       f.dmarc_enable_forensic = FALSE;

        #endif
        break;
        #endif
 
        #ifdef EXPERIMENTAL_DMARC
        case CONTROL_DMARC_VERIFY:
        #endif
        break;
        #endif
 
        #ifdef EXPERIMENTAL_DMARC
        case CONTROL_DMARC_VERIFY:

-       dmarc_disable_verify = TRUE;
+       f.dmarc_disable_verify = TRUE;

        break;
 
        case CONTROL_DMARC_FORENSIC:
        break;
 
        case CONTROL_DMARC_FORENSIC:

-       dmarc_enable_forensic = TRUE;
+       f.dmarc_enable_forensic = TRUE;

        break;
        #endif
 
        break;
        #endif
 


@@ -3181,7 +3068,7 @@ for (; cb != NULL; cb = cb->next)
          if (af < 0)
            {
            HDEBUG(D_acl)
          if (af < 0)
            {
            HDEBUG(D_acl)

-             debug_printf("smtp input is probably not a socket [%s], not setting DSCP\n",
+             debug_printf_indent("smtp input is probably not a socket [%s], not setting DSCP\n",

                  strerror(errno));
            break;
            }
                  strerror(errno));
            break;
            }


@@ -3189,12 +3076,12 @@ for (; cb != NULL; cb = cb->next)
            {
            if (setsockopt(fd, level, optname, &value, sizeof(value)) < 0)
              {
            {
            if (setsockopt(fd, level, optname, &value, sizeof(value)) < 0)
              {

-             HDEBUG(D_acl) debug_printf("failed to set input DSCP[%s]: %s\n",
+             HDEBUG(D_acl) debug_printf_indent("failed to set input DSCP[%s]: %s\n",

                  p+1, strerror(errno));
              }
            else
              {
                  p+1, strerror(errno));
              }
            else
              {

-             HDEBUG(D_acl) debug_printf("set input DSCP to \"%s\"\n", p+1);
+             HDEBUG(D_acl) debug_printf_indent("set input DSCP to \"%s\"\n", p+1);

              }
            }
          else
              }
            }
          else


@@ -3231,28 +3118,28 @@ for (; cb != NULL; cb = cb->next)
 
        #ifdef WITH_CONTENT_SCAN
        case CONTROL_NO_MBOX_UNSPOOL:
 
        #ifdef WITH_CONTENT_SCAN
        case CONTROL_NO_MBOX_UNSPOOL:

-       no_mbox_unspool = TRUE;
+       f.no_mbox_unspool = TRUE;

        break;
        #endif
 
        case CONTROL_NO_MULTILINE:
        break;
        #endif
 
        case CONTROL_NO_MULTILINE:

-       no_multiline_responses = TRUE;
+       f.no_multiline_responses = TRUE;

        break;
 
        case CONTROL_NO_PIPELINING:
        break;
 
        case CONTROL_NO_PIPELINING:

-       pipelining_enable = FALSE;
+       f.pipelining_enable = FALSE;

        break;
 
        case CONTROL_NO_DELAY_FLUSH:
        break;
 
        case CONTROL_NO_DELAY_FLUSH:

-       disable_delay_flush = TRUE;
+       f.disable_delay_flush = TRUE;

        break;
 
        case CONTROL_NO_CALLOUT_FLUSH:
        break;
 
        case CONTROL_NO_CALLOUT_FLUSH:

-       disable_callout_flush = TRUE;
+       f.disable_callout_flush = TRUE;

        break;
 
        case CONTROL_FAKEREJECT:
        break;
 
        case CONTROL_FAKEREJECT:

-       cancel_cutthrough_connection("fakereject");
+       cancel_cutthrough_connection(TRUE, US"fakereject");

        case CONTROL_FAKEDEFER:
        fake_response = (control_type == CONTROL_FAKEDEFER) ? DEFER : FAIL;
        if (*p == '/')
        case CONTROL_FAKEDEFER:
        fake_response = (control_type == CONTROL_FAKEDEFER) ? DEFER : FAIL;
        if (*p == '/')


@@ -3270,7 +3157,7 @@ for (; cb != NULL; cb = cb->next)
        break;
 
        case CONTROL_FREEZE:
        break;
 
        case CONTROL_FREEZE:

-       deliver_freeze = TRUE;
+       f.deliver_freeze = TRUE;

        deliver_frozen_at = time(NULL);
        freeze_tell = freeze_tell_config;       /* Reset to configured value */
        if (Ustrncmp(p, "/no_tell", 8) == 0)
        deliver_frozen_at = time(NULL);
        freeze_tell = freeze_tell_config;       /* Reset to configured value */
        if (Ustrncmp(p, "/no_tell", 8) == 0)


@@ -3283,24 +3170,29 @@ for (; cb != NULL; cb = cb->next)
          *log_msgptr = string_sprintf("syntax error in \"control=%s\"", arg);
          return ERROR;
          }
          *log_msgptr = string_sprintf("syntax error in \"control=%s\"", arg);
          return ERROR;
          }

-       cancel_cutthrough_connection("item frozen");
+       cancel_cutthrough_connection(TRUE, US"item frozen");

        break;
 
        case CONTROL_QUEUE_ONLY:
        break;
 
        case CONTROL_QUEUE_ONLY:

-       queue_only_policy = TRUE;
-       cancel_cutthrough_connection("queueing forced");
+       f.queue_only_policy = TRUE;
+       cancel_cutthrough_connection(TRUE, US"queueing forced");

        break;
 
        break;
 

+#if defined(SUPPORT_TLS) && defined(EXPERIMENTAL_REQUIRETLS)
+       case CONTROL_REQUIRETLS:
+       tls_requiretls |= REQUIRETLS_MSG;
+       break;
+#endif

        case CONTROL_SUBMISSION:
        originator_name = US"";
        case CONTROL_SUBMISSION:
        originator_name = US"";

-       submission_mode = TRUE;
+       f.submission_mode = TRUE;

        while (*p == '/')
          {
          if (Ustrncmp(p, "/sender_retain", 14) == 0)
            {
            p += 14;
        while (*p == '/')
          {
          if (Ustrncmp(p, "/sender_retain", 14) == 0)
            {
            p += 14;

-           active_local_sender_retain = TRUE;
-           active_local_from_check = FALSE;
+           f.active_local_sender_retain = TRUE;
+           f.active_local_from_check = FALSE;

            }
          else if (Ustrncmp(p, "/domain=", 8) == 0)
            {
            }
          else if (Ustrncmp(p, "/domain=", 8) == 0)
            {


@@ -3329,31 +3221,48 @@ for (; cb != NULL; cb = cb->next)
        break;
 
        case CONTROL_DEBUG:
        break;
 
        case CONTROL_DEBUG:

-       while (*p == '/')

          {
          {

-         if (Ustrncmp(p, "/tag=", 5) == 0)
-           {
-           const uschar *pp = p + 5;
-           while (*pp != '\0' && *pp != '/') pp++;
-           debug_tag = string_copyn(p+5, pp-p-5);
-           p = pp;
-           }
-         else if (Ustrncmp(p, "/opts=", 6) == 0)
+         uschar * debug_tag = NULL;
+         uschar * debug_opts = NULL;
+         BOOL kill = FALSE;
+
+         while (*p == '/')

            {
            {

-           const uschar *pp = p + 6;
-           while (*pp != '\0' && *pp != '/') pp++;
-           debug_opts = string_copyn(p+6, pp-p-6);
+           const uschar * pp = p+1;
+           if (Ustrncmp(pp, "tag=", 4) == 0)
+             {
+             for (pp += 4; *pp && *pp != '/';) pp++;
+             debug_tag = string_copyn(p+5, pp-p-5);
+             }
+           else if (Ustrncmp(pp, "opts=", 5) == 0)
+             {
+             for (pp += 5; *pp && *pp != '/';) pp++;
+             debug_opts = string_copyn(p+6, pp-p-6);
+             }
+           else if (Ustrncmp(pp, "kill", 4) == 0)
+             {
+             for (pp += 4; *pp && *pp != '/';) pp++;
+             kill = TRUE;
+             }
+           else
+             while (*pp && *pp != '/') pp++;

            p = pp;
            }
            p = pp;
            }

+
+           if (kill)
+             debug_logging_stop();
+           else
+             debug_logging_activate(debug_tag, debug_opts);

          }
          }

-         debug_logging_activate(debug_tag, debug_opts);

        break;
 
        case CONTROL_SUPPRESS_LOCAL_FIXUPS:
        break;
 
        case CONTROL_SUPPRESS_LOCAL_FIXUPS:

-       suppress_local_fixups = TRUE;
+       f.suppress_local_fixups = TRUE;

        break;
 
        case CONTROL_CUTTHROUGH_DELIVERY:
        break;
 
        case CONTROL_CUTTHROUGH_DELIVERY:

+       {
+       uschar * ignored = NULL;

 #ifndef DISABLE_PRDR
        if (prdr_requested)
 #else
 #ifndef DISABLE_PRDR
        if (prdr_requested)
 #else


@@ -3362,24 +3271,42 @@ for (; cb != NULL; cb = cb->next)
          /* Too hard to think about for now.  We might in future cutthrough
          the case where both sides handle prdr and this-node prdr acl
          is "accept" */
          /* Too hard to think about for now.  We might in future cutthrough
          the case where both sides handle prdr and this-node prdr acl
          is "accept" */

-         *log_msgptr = string_sprintf("PRDR on %s reception\n", arg);
+         ignored = US"PRDR active";

        else
          {
        else
          {

-         if (deliver_freeze)
-           *log_msgptr = US"frozen";
-         else if (queue_only_policy)
-           *log_msgptr = US"queue-only";
+         if (f.deliver_freeze)
+           ignored = US"frozen";
+         else if (f.queue_only_policy)
+           ignored = US"queue-only";

          else if (fake_response == FAIL)
          else if (fake_response == FAIL)

-           *log_msgptr = US"fakereject";
+           ignored = US"fakereject";

          else
            {
          else
            {

-           if (rcpt_count == 1) cutthrough.delivery = TRUE;
-           break;
+           if (rcpt_count == 1)
+             {
+             cutthrough.delivery = TRUE;       /* control accepted */
+             while (*p == '/')
+               {
+               const uschar * pp = p+1;
+               if (Ustrncmp(pp, "defer=", 6) == 0)
+                 {
+                 pp += 6;
+                 if (Ustrncmp(pp, "pass", 4) == 0) cutthrough.defer_pass = TRUE;
+                 /* else if (Ustrncmp(pp, "spool") == 0) ;     default */
+                 }
+               else
+                 while (*pp && *pp != '/') pp++;
+               p = pp;
+               }
+             }
+           else
+             ignored = US"nonfirst rcpt";

            }
            }

-         *log_msgptr = string_sprintf("\"control=%s\" on %s item",
-                                       arg, *log_msgptr);

          }
          }

-       return ERROR;
+       DEBUG(D_acl) if (ignored)
+         debug_printf(" cutthrough request ignored on %s item\n", ignored);
+       }
+       break;

 
 #ifdef SUPPORT_I18N
        case CONTROL_UTF8_DOWNCONVERT:
 
 #ifdef SUPPORT_I18N
        case CONTROL_UTF8_DOWNCONVERT:


@@ -3428,12 +3355,12 @@ for (; cb != NULL; cb = cb->next)
     #ifdef EXPERIMENTAL_DCC
     case ACLC_DCC:
       {
     #ifdef EXPERIMENTAL_DCC
     case ACLC_DCC:
       {

-      /* Seperate the regular expression and any optional parameters. */
+      /* Separate the regular expression and any optional parameters. */

       const uschar * list = arg;
       uschar *ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size);
       /* Run the dcc backend. */
       rc = dcc_process(&ss);
       const uschar * list = arg;
       uschar *ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size);
       /* Run the dcc backend. */
       rc = dcc_process(&ss);

-      /* Modify return code based upon the existance of options. */
+      /* Modify return code based upon the existence of options. */

       while ((ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size)))
         if (strcmpic(ss, US"defer_ok") == 0 && rc == DEFER)
           rc = FAIL;   /* FAIL so that the message is passed to the next ACL */
       while ((ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size)))
         if (strcmpic(ss, US"defer_ok") == 0 && rc == DEFER)
           rc = FAIL;   /* FAIL so that the message is passed to the next ACL */


@@ -3458,12 +3385,12 @@ for (; cb != NULL; cb = cb->next)
         }
       else
         {
         }
       else
         {

-        HDEBUG(D_acl) debug_printf("delay modifier requests %d-second delay\n",
+        HDEBUG(D_acl) debug_printf_indent("delay modifier requests %d-second delay\n",

           delay);
         if (host_checking)
           {
           HDEBUG(D_acl)
           delay);
         if (host_checking)
           {
           HDEBUG(D_acl)

-            debug_printf("delay skipped in -bh checking mode\n");
+            debug_printf_indent("delay skipped in -bh checking mode\n");

           }
 
        /* NOTE 1: Remember that we may be
           }
 
        /* NOTE 1: Remember that we may be


@@ -3477,7 +3404,7 @@ for (; cb != NULL; cb = cb->next)
 
         else
           {
 
         else
           {

-          if (smtp_out != NULL && !disable_delay_flush)
+          if (smtp_out && !f.disable_delay_flush)

            mac_smtp_fflush();
 
 #if !defined(NO_POLL_H) && defined (POLLRDHUP)
            mac_smtp_fflush();
 
 #if !defined(NO_POLL_H) && defined (POLLRDHUP)


@@ -3491,19 +3418,19 @@ for (; cb != NULL; cb = cb->next)
              n = 1;
              }
            if (poll(&p, n, delay*1000) > 0)
              n = 1;
              }
            if (poll(&p, n, delay*1000) > 0)

-             HDEBUG(D_acl) debug_printf("delay cancelled by peer close\n");
+             HDEBUG(D_acl) debug_printf_indent("delay cancelled by peer close\n");

            }
 #else
            }
 #else

-        /* It appears to be impossible to detect that a TCP/IP connection has
-        gone away without reading from it. This means that we cannot shorten
-        the delay below if the client goes away, because we cannot discover
-        that the client has closed its end of the connection. (The connection
-        is actually in a half-closed state, waiting for the server to close its
-        end.) It would be nice to be able to detect this state, so that the
-        Exim process is not held up unnecessarily. However, it seems that we
-        can't. The poll() function does not do the right thing, and in any case
-        it is not always available.
-        */
+         /* Lacking POLLRDHUP it appears to be impossible to detect that a
+         TCP/IP connection has gone away without reading from it. This means
+         that we cannot shorten the delay below if the client goes away,
+         because we cannot discover that the client has closed its end of the
+         connection. (The connection is actually in a half-closed state,
+         waiting for the server to close its end.) It would be nice to be able
+         to detect this state, so that the Exim process is not held up
+         unnecessarily. However, it seems that we can't. The poll() function
+         does not do the right thing, and in any case it is not always
+         available.  */

 
           while (delay > 0) delay = sleep(delay);
 #endif
 
           while (delay > 0) delay = sleep(delay);
 #endif


@@ -3514,24 +3441,24 @@ for (; cb != NULL; cb = cb->next)
 
     #ifndef DISABLE_DKIM
     case ACLC_DKIM_SIGNER:
 
     #ifndef DISABLE_DKIM
     case ACLC_DKIM_SIGNER:

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

       rc = match_isinlist(dkim_cur_signer,
                           &arg,0,NULL,NULL,MCL_STRING,TRUE,NULL);
     else
       rc = match_isinlist(dkim_cur_signer,
                           &arg,0,NULL,NULL,MCL_STRING,TRUE,NULL);
     else

-       rc = FAIL;
+      rc = FAIL;

     break;
 
     case ACLC_DKIM_STATUS:
     break;
 
     case ACLC_DKIM_STATUS:

-    rc = match_isinlist(dkim_exim_expand_query(DKIM_VERIFY_STATUS),
+    rc = match_isinlist(dkim_verify_status,

                         &arg,0,NULL,NULL,MCL_STRING,TRUE,NULL);
     break;
     #endif
 
     #ifdef EXPERIMENTAL_DMARC
     case ACLC_DMARC_STATUS:
                         &arg,0,NULL,NULL,MCL_STRING,TRUE,NULL);
     break;
     #endif
 
     #ifdef EXPERIMENTAL_DMARC
     case ACLC_DMARC_STATUS:

-    if (!dmarc_has_been_checked)
+    if (!f.dmarc_has_been_checked)

       dmarc_process();
       dmarc_process();

-    dmarc_has_been_checked = TRUE;
+    f.dmarc_has_been_checked = TRUE;

     /* used long way of dmarc_exim_expand_query() in case we need more
      * view into the process in the future. */
     rc = match_isinlist(dmarc_exim_expand_query(DMARC_VERIFY_STATUS),
     /* used long way of dmarc_exim_expand_query() in case we need more
      * view into the process in the future. */
     rc = match_isinlist(dmarc_exim_expand_query(DMARC_VERIFY_STATUS),


@@ -3677,12 +3604,22 @@ for (; cb != NULL; cb = cb->next)
     break;
     #endif
 
     break;
     #endif
 

+    case ACLC_QUEUE:
+    if (Ustrchr(arg, '/'))
+      {
+      *log_msgptr = string_sprintf(
+             "Directory separator not permitted in queue name: '%s'", arg);
+      return ERROR;
+      }
+    queue_name = string_copy_malloc(arg);
+    break;
+

     case ACLC_RATELIMIT:
     rc = acl_ratelimit(arg, where, log_msgptr);
     break;
 
     case ACLC_RECIPIENTS:
     case ACLC_RATELIMIT:
     rc = acl_ratelimit(arg, where, log_msgptr);
     break;
 
     case ACLC_RECIPIENTS:

-    rc = match_address_list((const uschar *)addr->address, TRUE, TRUE, &arg, NULL, -1, 0,
+    rc = match_address_list(CUS addr->address, TRUE, TRUE, &arg, NULL, -1, 0,

       CUSS &recipient_data);
     break;
 
       CUSS &recipient_data);
     break;
 


@@ -3700,14 +3637,14 @@ for (; cb != NULL; cb = cb->next)
       {
       uschar *sdomain;
       sdomain = Ustrrchr(sender_address, '@');
       {
       uschar *sdomain;
       sdomain = Ustrrchr(sender_address, '@');

-      sdomain = (sdomain == NULL)? US"" : sdomain + 1;
+      sdomain = sdomain ? sdomain + 1 : US"";

       rc = match_isinlist(sdomain, &arg, 0, &domainlist_anchor,
         sender_domain_cache, MCL_DOMAIN, TRUE, NULL);
       }
     break;
 
     case ACLC_SENDERS:
       rc = match_isinlist(sdomain, &arg, 0, &domainlist_anchor,
         sender_domain_cache, MCL_DOMAIN, TRUE, NULL);
       }
     break;
 
     case ACLC_SENDERS:

-    rc = match_address_list((const uschar *)sender_address, TRUE, TRUE, &arg,
+    rc = match_address_list(CUS sender_address, TRUE, TRUE, &arg,

       sender_address_cache, -1, 0, CUSS &sender_data);
     break;
 
       sender_address_cache, -1, 0, CUSS &sender_data);
     break;
 


@@ -3717,45 +3654,50 @@ for (; cb != NULL; cb = cb->next)
       {
       int old_pool = store_pool;
       if (  cb->u.varname[0] == 'c'
       {
       int old_pool = store_pool;
       if (  cb->u.varname[0] == 'c'

+#ifndef DISABLE_DKIM
+         || cb->u.varname[0] == 'd'
+#endif

 #ifndef DISABLE_EVENT
         || event_name          /* An event is being delivered */
 #endif
         )
         store_pool = POOL_PERM;
 #ifndef DISABLE_EVENT
         || event_name          /* An event is being delivered */
 #endif
         )
         store_pool = POOL_PERM;

-      acl_var_create(cb->u.varname)->data.ptr = string_copy(arg);
+#ifndef DISABLE_DKIM   /* Overwriteable dkim result variables */
+      if (Ustrcmp(cb->u.varname, "dkim_verify_status") == 0)
+       dkim_verify_status = string_copy(arg);
+      else if (Ustrcmp(cb->u.varname, "dkim_verify_reason") == 0)
+       dkim_verify_reason = string_copy(arg);
+      else
+#endif
+       acl_var_create(cb->u.varname)->data.ptr = string_copy(arg);

       store_pool = old_pool;
       }
     break;
 
       store_pool = old_pool;
       }
     break;
 

-    #ifdef WITH_CONTENT_SCAN
+#ifdef WITH_CONTENT_SCAN

     case ACLC_SPAM:
       {
     case ACLC_SPAM:
       {

-      /* Seperate the regular expression and any optional parameters. */
+      /* Separate the regular expression and any optional parameters. */

       const uschar * list = arg;
       uschar *ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size);
       const uschar * list = arg;
       uschar *ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size);

-      /* Run the spam backend. */
+

       rc = spam(CUSS &ss);
       rc = spam(CUSS &ss);

-      /* Modify return code based upon the existance of options. */
-      while ((ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size))
-            != NULL) {
+      /* Modify return code based upon the existence of options. */
+      while ((ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size)))

         if (strcmpic(ss, US"defer_ok") == 0 && rc == DEFER)
         if (strcmpic(ss, US"defer_ok") == 0 && rc == DEFER)

-          {
-          /* FAIL so that the message is passed to the next ACL */
-          rc = FAIL;
-          }
-        }
+          rc = FAIL;   /* FAIL so that the message is passed to the next ACL */

       }
     break;
       }
     break;

-    #endif
+#endif

 
 

-    #ifdef EXPERIMENTAL_SPF
+#ifdef SUPPORT_SPF

     case ACLC_SPF:
       rc = spf_process(&arg, sender_address, SPF_PROCESS_NORMAL);
     break;
     case ACLC_SPF_GUESS:
       rc = spf_process(&arg, sender_address, SPF_PROCESS_GUESS);
     break;
     case ACLC_SPF:
       rc = spf_process(&arg, sender_address, SPF_PROCESS_NORMAL);
     break;
     case ACLC_SPF_GUESS:
       rc = spf_process(&arg, sender_address, SPF_PROCESS_GUESS);
     break;

-    #endif
+#endif

 
     case ACLC_UDPSEND:
     rc = acl_udpsend(arg, log_msgptr);
 
     case ACLC_UDPSEND:
     rc = acl_udpsend(arg, log_msgptr);


@@ -3782,11 +3724,9 @@ for (; cb != NULL; cb = cb->next)
 
   /* If a condition was negated, invert OK/FAIL. */
 
 
   /* If a condition was negated, invert OK/FAIL. */
 

-  if (!cond_modifiers[cb->type] && cb->u.negated)
-    {
+  if (!conditions[cb->type].is_modifier && cb->u.negated)

     if (rc == OK) rc = FAIL;
     if (rc == OK) rc = FAIL;

-      else if (rc == FAIL || rc == FAIL_DROP) rc = OK;
-    }
+    else if (rc == FAIL || rc == FAIL_DROP) rc = OK;

 
   if (rc != OK) break;   /* Conditions loop */
   }
 
   if (rc != OK) break;   /* Conditions loop */
   }


@@ -3810,7 +3750,7 @@ present. */
 
 if (*epp && rc == OK) user_message = NULL;
 
 
 if (*epp && rc == OK) user_message = NULL;
 

-if (((1<<rc) & msgcond[verb]) != 0)
+if ((BIT(rc) & msgcond[verb]) != 0)

   {
   uschar *expmessage;
   uschar *old_user_msgptr = *user_msgptr;
   {
   uschar *expmessage;
   uschar *old_user_msgptr = *user_msgptr;


@@ -3826,26 +3766,26 @@ if (((1<<rc) & msgcond[verb]) != 0)
       (rc == OK && (verb == ACL_ACCEPT || verb == ACL_DISCARD)))
     *log_msgptr = *user_msgptr = NULL;
 
       (rc == OK && (verb == ACL_ACCEPT || verb == ACL_DISCARD)))
     *log_msgptr = *user_msgptr = NULL;
 

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

     {
     acl_verify_message = old_user_msgptr;
     expmessage = expand_string(user_message);
     {
     acl_verify_message = old_user_msgptr;
     expmessage = expand_string(user_message);

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

       {
       {

-      if (!expand_string_forcedfail)
+      if (!f.expand_string_forcedfail)

         log_write(0, LOG_MAIN|LOG_PANIC, "failed to expand ACL message \"%s\": %s",
           user_message, expand_string_message);
       }
     else if (expmessage[0] != 0) *user_msgptr = expmessage;
     }
 
         log_write(0, LOG_MAIN|LOG_PANIC, "failed to expand ACL message \"%s\": %s",
           user_message, expand_string_message);
       }
     else if (expmessage[0] != 0) *user_msgptr = expmessage;
     }
 

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

     {
     acl_verify_message = old_log_msgptr;
     expmessage = expand_string(log_message);
     {
     acl_verify_message = old_log_msgptr;
     expmessage = expand_string(log_message);

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

       {
       {

-      if (!expand_string_forcedfail)
+      if (!f.expand_string_forcedfail)

         log_write(0, LOG_MAIN|LOG_PANIC, "failed to expand ACL message \"%s\": %s",
           log_message, expand_string_message);
       }
         log_write(0, LOG_MAIN|LOG_PANIC, "failed to expand ACL message \"%s\": %s",
           log_message, expand_string_message);
       }


@@ -3858,7 +3798,7 @@ if (((1<<rc) & msgcond[verb]) != 0)
 
   /* If no log message, default it to the user message */
 
 
   /* If no log message, default it to the user message */
 

-  if (*log_msgptr == NULL) *log_msgptr = *user_msgptr;
+  if (!*log_msgptr) *log_msgptr = *user_msgptr;

   }
 
 acl_verify_message = NULL;
   }
 
 acl_verify_message = NULL;


@@ -3992,7 +3932,6 @@ Arguments:
   where        where called from
   addr         address item when called from RCPT; otherwise NULL
   s            the input string; NULL is the same as an empty ACL => DENY
   where        where called from
   addr         address item when called from RCPT; otherwise NULL
   s            the input string; NULL is the same as an empty ACL => DENY

-  level        the nesting level

   user_msgptr  where to put a user error (for SMTP response)
   log_msgptr   where to put a logging message (not for SMTP response)
 
   user_msgptr  where to put a user error (for SMTP response)
   log_msgptr   where to put a logging message (not for SMTP response)
 


@@ -4005,7 +3944,7 @@ Returns:       OK         access is granted
 */
 
 static int
 */
 
 static int

-acl_check_internal(int where, address_item *addr, uschar *s, int level,
+acl_check_internal(int where, address_item *addr, uschar *s,

   uschar **user_msgptr, uschar **log_msgptr)
 {
 int fd = -1;
   uschar **user_msgptr, uschar **log_msgptr)
 {
 int fd = -1;


@@ -4015,27 +3954,26 @@ uschar *ss;
 
 /* Catch configuration loops */
 
 
 /* Catch configuration loops */
 

-if (level > 20)
+if (acl_level > 20)

   {
   *log_msgptr = US"ACL nested too deep: possible loop";
   return ERROR;
   }
 
   {
   *log_msgptr = US"ACL nested too deep: possible loop";
   return ERROR;
   }
 

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

   {
   {

-  HDEBUG(D_acl) debug_printf("ACL is NULL: implicit DENY\n");
+  HDEBUG(D_acl) debug_printf_indent("ACL is NULL: implicit DENY\n");

   return FAIL;
   }
 
 /* At top level, we expand the incoming string. At lower levels, it has already
 been expanded as part of condition processing. */
 
   return FAIL;
   }
 
 /* At top level, we expand the incoming string. At lower levels, it has already
 been expanded as part of condition processing. */
 

-if (level == 0)
+if (acl_level == 0)

   {
   {

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

     {
     {

-    if (expand_string_forcedfail) return OK;
+    if (f.expand_string_forcedfail) return OK;

     *log_msgptr = string_sprintf("failed to expand ACL string \"%s\": %s", s,
       expand_string_message);
     return ERROR;
     *log_msgptr = string_sprintf("failed to expand ACL string \"%s\": %s", s,
       expand_string_message);
     return ERROR;


@@ -4043,7 +3981,7 @@ if (level == 0)
   }
 else ss = s;
 
   }
 else ss = s;
 

-while (isspace(*ss))ss++;
+while (isspace(*ss)) ss++;

 
 /* If we can't find a named ACL, the default is to parse it as an inline one.
 (Unless it begins with a slash; non-existent files give rise to an error.) */
 
 /* If we can't find a named ACL, the default is to parse it as an inline one.
 (Unless it begins with a slash; non-existent files give rise to an error.) */


@@ -4064,11 +4002,11 @@ if (Ustrchr(ss, ' ') == NULL)
     acl = (acl_block *)(t->data.ptr);
     if (acl == NULL)
       {
     acl = (acl_block *)(t->data.ptr);
     if (acl == NULL)
       {

-      HDEBUG(D_acl) debug_printf("ACL \"%s\" is empty: implicit DENY\n", ss);
+      HDEBUG(D_acl) debug_printf_indent("ACL \"%s\" is empty: implicit DENY\n", ss);

       return FAIL;
       }
     acl_name = string_sprintf("ACL \"%s\"", ss);
       return FAIL;
       }
     acl_name = string_sprintf("ACL \"%s\"", ss);

-    HDEBUG(D_acl) debug_printf("using ACL \"%s\"\n", ss);
+    HDEBUG(D_acl) debug_printf_indent("using ACL \"%s\"\n", ss);

     }
 
   else if (*ss == '/')
     }
 
   else if (*ss == '/')


@@ -4102,7 +4040,7 @@ if (Ustrchr(ss, ' ') == NULL)
     (void)close(fd);
 
     acl_name = string_sprintf("ACL \"%s\"", ss);
     (void)close(fd);
 
     acl_name = string_sprintf("ACL \"%s\"", ss);

-    HDEBUG(D_acl) debug_printf("read ACL from file %s\n", ss);
+    HDEBUG(D_acl) debug_printf_indent("read ACL from file %s\n", ss);

     }
   }
 
     }
   }
 


@@ -4133,19 +4071,19 @@ while (acl != NULL)
   int cond;
   int basic_errno = 0;
   BOOL endpass_seen = FALSE;
   int cond;
   int basic_errno = 0;
   BOOL endpass_seen = FALSE;

-  BOOL acl_quit_check = level == 0
+  BOOL acl_quit_check = acl_level == 0

     && (where == ACL_WHERE_QUIT || where == ACL_WHERE_NOTQUIT);
 
   *log_msgptr = *user_msgptr = NULL;
     && (where == ACL_WHERE_QUIT || where == ACL_WHERE_NOTQUIT);
 
   *log_msgptr = *user_msgptr = NULL;

-  acl_temp_details = FALSE;
+  f.acl_temp_details = FALSE;

 
 

-  HDEBUG(D_acl) debug_printf("processing \"%s\"\n", verbs[acl->verb]);
+  HDEBUG(D_acl) debug_printf_indent("processing \"%s\"\n", verbs[acl->verb]);

 
   /* Clear out any search error message from a previous check before testing
   this condition. */
 
   search_error_message = NULL;
 
   /* Clear out any search error message from a previous check before testing
   this condition. */
 
   search_error_message = NULL;

-  cond = acl_check_condition(acl->verb, acl->condition, where, addr, level,
+  cond = acl_check_condition(acl->verb, acl->condition, where, addr, acl_level,

     &endpass_seen, user_msgptr, log_msgptr, &basic_errno);
 
   /* Handle special returns: DEFER causes a return except on a WARN verb;
     &endpass_seen, user_msgptr, log_msgptr, &basic_errno);
 
   /* Handle special returns: DEFER causes a return except on a WARN verb;


@@ -4154,44 +4092,42 @@ while (acl != NULL)
   switch (cond)
     {
     case DEFER:
   switch (cond)
     {
     case DEFER:

-    HDEBUG(D_acl) debug_printf("%s: condition test deferred in %s\n", verbs[acl->verb], acl_name);
+    HDEBUG(D_acl) debug_printf_indent("%s: condition test deferred in %s\n", verbs[acl->verb], acl_name);

     if (basic_errno != ERRNO_CALLOUTDEFER)
       {
       if (search_error_message != NULL && *search_error_message != 0)
         *log_msgptr = search_error_message;
     if (basic_errno != ERRNO_CALLOUTDEFER)
       {
       if (search_error_message != NULL && *search_error_message != 0)
         *log_msgptr = search_error_message;

-      if (smtp_return_error_details) acl_temp_details = TRUE;
+      if (smtp_return_error_details) f.acl_temp_details = TRUE;

       }
     else
       }
     else

-      {
-      acl_temp_details = TRUE;
-      }
+      f.acl_temp_details = TRUE;

     if (acl->verb != ACL_WARN) return DEFER;
     break;
 
     default:      /* Paranoia */
     case ERROR:
     if (acl->verb != ACL_WARN) return DEFER;
     break;
 
     default:      /* Paranoia */
     case ERROR:

-    HDEBUG(D_acl) debug_printf("%s: condition test error in %s\n", verbs[acl->verb], acl_name);
+    HDEBUG(D_acl) debug_printf_indent("%s: condition test error in %s\n", verbs[acl->verb], acl_name);

     return ERROR;
 
     case OK:
     return ERROR;
 
     case OK:

-    HDEBUG(D_acl) debug_printf("%s: condition test succeeded in %s\n",
+    HDEBUG(D_acl) debug_printf_indent("%s: condition test succeeded in %s\n",

       verbs[acl->verb], acl_name);
     break;
 
     case FAIL:
       verbs[acl->verb], acl_name);
     break;
 
     case FAIL:

-    HDEBUG(D_acl) debug_printf("%s: condition test failed in %s\n", verbs[acl->verb], acl_name);
+    HDEBUG(D_acl) debug_printf_indent("%s: condition test failed in %s\n", verbs[acl->verb], acl_name);

     break;
 
     /* DISCARD and DROP can happen only from a nested ACL condition, and
     DISCARD can happen only for an "accept" or "discard" verb. */
 
     case DISCARD:
     break;
 
     /* DISCARD and DROP can happen only from a nested ACL condition, and
     DISCARD can happen only for an "accept" or "discard" verb. */
 
     case DISCARD:

-    HDEBUG(D_acl) debug_printf("%s: condition test yielded \"discard\" in %s\n",
+    HDEBUG(D_acl) debug_printf_indent("%s: condition test yielded \"discard\" in %s\n",

       verbs[acl->verb], acl_name);
     break;
 
     case FAIL_DROP:
       verbs[acl->verb], acl_name);
     break;
 
     case FAIL_DROP:

-    HDEBUG(D_acl) debug_printf("%s: condition test yielded \"drop\" in %s\n",
+    HDEBUG(D_acl) debug_printf_indent("%s: condition test yielded \"drop\" in %s\n",

       verbs[acl->verb], acl_name);
     break;
     }
       verbs[acl->verb], acl_name);
     break;
     }


@@ -4205,12 +4141,12 @@ while (acl != NULL)
     case ACL_ACCEPT:
     if (cond == OK || cond == DISCARD)
       {
     case ACL_ACCEPT:
     if (cond == OK || cond == DISCARD)
       {

-      HDEBUG(D_acl) debug_printf("end of %s: ACCEPT\n", acl_name);
+      HDEBUG(D_acl) debug_printf_indent("end of %s: ACCEPT\n", acl_name);

       return cond;
       }
     if (endpass_seen)
       {
       return cond;
       }
     if (endpass_seen)
       {

-      HDEBUG(D_acl) debug_printf("accept: endpass encountered - denying access\n");
+      HDEBUG(D_acl) debug_printf_indent("accept: endpass encountered - denying access\n");

       return cond;
       }
     break;
       return cond;
       }
     break;


@@ -4218,9 +4154,9 @@ while (acl != NULL)
     case ACL_DEFER:
     if (cond == OK)
       {
     case ACL_DEFER:
     if (cond == OK)
       {

-      HDEBUG(D_acl) debug_printf("end of %s: DEFER\n", acl_name);
+      HDEBUG(D_acl) debug_printf_indent("end of %s: DEFER\n", acl_name);

       if (acl_quit_check) goto badquit;
       if (acl_quit_check) goto badquit;

-      acl_temp_details = TRUE;
+      f.acl_temp_details = TRUE;

       return DEFER;
       }
     break;
       return DEFER;
       }
     break;


@@ -4228,7 +4164,7 @@ while (acl != NULL)
     case ACL_DENY:
     if (cond == OK)
       {
     case ACL_DENY:
     if (cond == OK)
       {

-      HDEBUG(D_acl) debug_printf("end of %s: DENY\n", acl_name);
+      HDEBUG(D_acl) debug_printf_indent("end of %s: DENY\n", acl_name);

       if (acl_quit_check) goto badquit;
       return FAIL;
       }
       if (acl_quit_check) goto badquit;
       return FAIL;
       }


@@ -4237,13 +4173,13 @@ while (acl != NULL)
     case ACL_DISCARD:
     if (cond == OK || cond == DISCARD)
       {
     case ACL_DISCARD:
     if (cond == OK || cond == DISCARD)
       {

-      HDEBUG(D_acl) debug_printf("end of %s: DISCARD\n", acl_name);
+      HDEBUG(D_acl) debug_printf_indent("end of %s: DISCARD\n", acl_name);

       if (acl_quit_check) goto badquit;
       return DISCARD;
       }
     if (endpass_seen)
       {
       if (acl_quit_check) goto badquit;
       return DISCARD;
       }
     if (endpass_seen)
       {

-      HDEBUG(D_acl) debug_printf("discard: endpass encountered - denying access\n");
+      HDEBUG(D_acl) debug_printf_indent("discard: endpass encountered - denying access\n");

       return cond;
       }
     break;
       return cond;
       }
     break;


@@ -4251,7 +4187,7 @@ while (acl != NULL)
     case ACL_DROP:
     if (cond == OK)
       {
     case ACL_DROP:
     if (cond == OK)
       {

-      HDEBUG(D_acl) debug_printf("end of %s: DROP\n", acl_name);
+      HDEBUG(D_acl) debug_printf_indent("end of %s: DROP\n", acl_name);

       if (acl_quit_check) goto badquit;
       return FAIL_DROP;
       }
       if (acl_quit_check) goto badquit;
       return FAIL_DROP;
       }


@@ -4260,7 +4196,7 @@ while (acl != NULL)
     case ACL_REQUIRE:
     if (cond != OK)
       {
     case ACL_REQUIRE:
     if (cond != OK)
       {

-      HDEBUG(D_acl) debug_printf("end of %s: not OK\n", acl_name);
+      HDEBUG(D_acl) debug_printf_indent("end of %s: not OK\n", acl_name);

       if (acl_quit_check) goto badquit;
       return cond;
       }
       if (acl_quit_check) goto badquit;
       return cond;
       }


@@ -4290,11 +4226,11 @@ while (acl != NULL)
 
 /* We have reached the end of the ACL. This is an implicit DENY. */
 
 
 /* We have reached the end of the ACL. This is an implicit DENY. */
 

-HDEBUG(D_acl) debug_printf("end of %s: implicit DENY\n", acl_name);
+HDEBUG(D_acl) debug_printf_indent("end of %s: implicit DENY\n", acl_name);

 return FAIL;
 
 badquit:
 return FAIL;
 
 badquit:

-  *log_msgptr = string_sprintf("QUIT or not-QUIT teplevel ACL may not fail "
+  *log_msgptr = string_sprintf("QUIT or not-QUIT toplevel ACL may not fail "

     "('%s' verb used incorrectly)", verbs[acl->verb]);
   return ERROR;
 }
     "('%s' verb used incorrectly)", verbs[acl->verb]);
   return ERROR;
 }


@@ -4306,7 +4242,7 @@ badquit:
 the name of an ACL followed optionally by up to 9 space-separated arguments.
 The name and args are separately expanded.  Args go into $acl_arg globals. */
 static int
 the name of an ACL followed optionally by up to 9 space-separated arguments.
 The name and args are separately expanded.  Args go into $acl_arg globals. */
 static int

-acl_check_wargs(int where, address_item *addr, const uschar *s, int level,
+acl_check_wargs(int where, address_item *addr, const uschar *s,

   uschar **user_msgptr, uschar **log_msgptr)
 {
 uschar * tmp;
   uschar **user_msgptr, uschar **log_msgptr)
 {
 uschar * tmp;


@@ -4344,17 +4280,19 @@ while (i < 9)
   acl_arg[i++] = NULL;
   }
 
   acl_arg[i++] = NULL;
   }
 

-ret = acl_check_internal(where, addr, name, level, user_msgptr, log_msgptr);
+acl_level++;
+ret = acl_check_internal(where, addr, name, user_msgptr, log_msgptr);
+acl_level--;

 
 acl_narg = sav_narg;
 for (i = 0; i < 9; i++) acl_arg[i] = sav_arg[i];
 return ret;
 
 bad:
 
 acl_narg = sav_narg;
 for (i = 0; i < 9; i++) acl_arg[i] = sav_arg[i];
 return ret;
 
 bad:

-if (expand_string_forcedfail) return ERROR;
+if (f.expand_string_forcedfail) return ERROR;

 *log_msgptr = string_sprintf("failed to expand ACL string \"%s\": %s",
   tmp, expand_string_message);
 *log_msgptr = string_sprintf("failed to expand ACL string \"%s\": %s",
   tmp, expand_string_message);

-return search_find_defer?DEFER:ERROR;
+return f.search_find_defer ? DEFER : ERROR;

 }
 
 
 }
 
 


@@ -4369,6 +4307,7 @@ acl_eval(int where, uschar *s, uschar **user_msgptr, uschar **log_msgptr)
 {
 address_item adb;
 address_item *addr = NULL;
 {
 address_item adb;
 address_item *addr = NULL;

+int rc;

 
 *user_msgptr = *log_msgptr = NULL;
 sender_verified_failed = NULL;
 
 *user_msgptr = *log_msgptr = NULL;
 sender_verified_failed = NULL;


@@ -4386,7 +4325,10 @@ if (where == ACL_WHERE_RCPT)
   addr->lc_local_part = deliver_localpart;
   }
 
   addr->lc_local_part = deliver_localpart;
   }
 

-return acl_check_internal(where, addr, s, 0, user_msgptr, log_msgptr);
+acl_level++;
+rc = acl_check_internal(where, addr, s, user_msgptr, log_msgptr);
+acl_level--;
+return rc;

 }
 
 
 }
 
 


@@ -4450,7 +4392,9 @@ if (where==ACL_WHERE_RCPT || where==ACL_WHERE_VRFY)
   }
 
 acl_where = where;
   }
 
 acl_where = where;

-rc = acl_check_internal(where, addr, s, 0, user_msgptr, log_msgptr);
+acl_level = 0;
+rc = acl_check_internal(where, addr, s, user_msgptr, log_msgptr);
+acl_level = 0;

 acl_where = ACL_WHERE_UNKNOWN;
 
 /* Cutthrough - if requested,
 acl_where = ACL_WHERE_UNKNOWN;
 
 /* Cutthrough - if requested,


@@ -4473,35 +4417,68 @@ If temp-reject, close the conn (and keep the spooled copy).
 If conn-failure, no action (and keep the spooled copy).
 */
 switch (where)
 If conn-failure, no action (and keep the spooled copy).
 */
 switch (where)

-{
-case ACL_WHERE_RCPT:
+  {
+  case ACL_WHERE_RCPT:

 #ifndef DISABLE_PRDR
 #ifndef DISABLE_PRDR

-case ACL_WHERE_PRDR:
+  case ACL_WHERE_PRDR:

 #endif
 #endif

-  if (host_checking_callout)   /* -bhc mode */
-    cancel_cutthrough_connection("host-checking mode");
-  else if (rc == OK && cutthrough.delivery && rcpt_count > cutthrough.nrcpt)
-    rc = open_cutthrough_connection(addr);
-  break;

 
 

-case ACL_WHERE_PREDATA:
-  if (rc == OK)
-    cutthrough_predata();
-  else
-    cancel_cutthrough_connection("predata acl not ok");
-  break;
+    if (f.host_checking_callout)       /* -bhc mode */
+      cancel_cutthrough_connection(TRUE, US"host-checking mode");

 
 

-case ACL_WHERE_QUIT:
-case ACL_WHERE_NOTQUIT:
-  cancel_cutthrough_connection("quit or notquit");
-  break;
+    else if (  rc == OK
+           && cutthrough.delivery
+           && rcpt_count > cutthrough.nrcpt
+           )
+      {
+      if ((rc = open_cutthrough_connection(addr)) == DEFER)
+       if (cutthrough.defer_pass)
+         {
+         uschar * s = addr->message;
+         /* Horrid kludge to recover target's SMTP message */
+         while (*s) s++;
+         do --s; while (!isdigit(*s));
+         if (*--s && isdigit(*s) && *--s && isdigit(*s)) *user_msgptr = s;
+         f.acl_temp_details = TRUE;
+         }
+       else
+         {
+         HDEBUG(D_acl) debug_printf_indent("cutthrough defer; will spool\n");
+         rc = OK;
+         }
+      }
+    else HDEBUG(D_acl) if (cutthrough.delivery)
+      if (rcpt_count <= cutthrough.nrcpt)
+       debug_printf_indent("ignore cutthrough request; nonfirst message\n");
+      else if (rc != OK)
+       debug_printf_indent("ignore cutthrough request; ACL did not accept\n");
+    break;

 
 

-default:
-  break;
-}
+  case ACL_WHERE_PREDATA:
+    if (rc == OK)
+      cutthrough_predata();
+    else
+      cancel_cutthrough_connection(TRUE, US"predata acl not ok");
+    break;
+
+  case ACL_WHERE_QUIT:
+  case ACL_WHERE_NOTQUIT:
+    /* Drop cutthrough conns, and drop heldopen verify conns if
+    the previous was not DATA */
+    {
+    uschar prev = smtp_connection_had[smtp_ch_index-2];
+    BOOL dropverify = !(prev == SCH_DATA || prev == SCH_BDAT);
+
+    cancel_cutthrough_connection(dropverify, US"quit or conndrop");
+    break;
+    }
+
+  default:
+    break;
+  }

 
 deliver_domain = deliver_localpart = deliver_address_data =
 
 deliver_domain = deliver_localpart = deliver_address_data =

-  sender_address_data = NULL;
+  deliver_domain_data = sender_address_data = NULL;

 
 /* A DISCARD response is permitted only for message ACLs, excluding the PREDATA
 ACL, which is really in the middle of an SMTP command. */
 
 /* A DISCARD response is permitted only for message ACLs, excluding the PREDATA
 ACL, which is really in the middle of an SMTP command. */


@@ -4551,12 +4528,10 @@ Returns   the pointer to variable's tree node
 */
 
 tree_node *
 */
 
 tree_node *

-acl_var_create(uschar *name)
+acl_var_create(uschar * name)

 {
 {

-tree_node *node, **root;
-root = (name[0] == 'c')? &acl_var_c : &acl_var_m;
-node = tree_search(*root, name);
-if (node == NULL)
+tree_node * node, ** root = name[0] == 'c' ? &acl_var_c : &acl_var_m;
+if (!(node = tree_search(*root, name)))

   {
   node = store_get(sizeof(tree_node) + Ustrlen(name));
   Ustrcpy(node->name, name);
   {
   node = store_get(sizeof(tree_node) + Ustrlen(name));
   Ustrcpy(node->name, name);