Fix dkim_strict expansion. Bug 2413

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

diff --git a/src/src/readconf.c b/src/src/readconf.c
index acf64570a6d56cc75f2e56d8ed90506236ea1123..52c64830e5eea5a7d6883b34b081e784dab3abf0 100644 (file)
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

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

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for reading the configuration file, and for displaying
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for reading the configuration file, and for displaying


@@ -15,8 +15,11 @@ implementation of the conditional .ifdef etc. */
 # include "macro_predef.h"
 #endif
 
 # include "macro_predef.h"
 #endif
 

+#define READCONF_DEBUG if (FALSE)      /* Change to TRUE to enable */
+
+

 static uschar * syslog_facility_str;
 static uschar * syslog_facility_str;

-static void fn_smtp_receive_timeout(const uschar *, const uschar *);
+static void fn_smtp_receive_timeout(const uschar *, const uschar *, unsigned);

 
 /*************************************************
 *           Main configuration options           *
 
 /*************************************************
 *           Main configuration options           *


@@ -57,7 +60,7 @@ static optionlist optionlist_config[] = {
   { "acl_smtp_predata",         opt_stringptr,   &acl_smtp_predata },
   { "acl_smtp_quit",            opt_stringptr,   &acl_smtp_quit },
   { "acl_smtp_rcpt",            opt_stringptr,   &acl_smtp_rcpt },
   { "acl_smtp_predata",         opt_stringptr,   &acl_smtp_predata },
   { "acl_smtp_quit",            opt_stringptr,   &acl_smtp_quit },
   { "acl_smtp_rcpt",            opt_stringptr,   &acl_smtp_rcpt },

-#ifdef SUPPORT_TLS
+#ifndef DISABLE_TLS

   { "acl_smtp_starttls",        opt_stringptr,   &acl_smtp_starttls },
 #endif
   { "acl_smtp_vrfy",            opt_stringptr,   &acl_smtp_vrfy },
   { "acl_smtp_starttls",        opt_stringptr,   &acl_smtp_starttls },
 #endif
   { "acl_smtp_vrfy",            opt_stringptr,   &acl_smtp_vrfy },


@@ -123,6 +126,7 @@ static optionlist optionlist_config[] = {
 #endif
   { "dns_again_means_nonexist", opt_stringptr,   &dns_again_means_nonexist },
   { "dns_check_names_pattern",  opt_stringptr,   &check_dns_names_pattern },
 #endif
   { "dns_again_means_nonexist", opt_stringptr,   &dns_again_means_nonexist },
   { "dns_check_names_pattern",  opt_stringptr,   &check_dns_names_pattern },

+  { "dns_cname_loops",         opt_int,         &dns_cname_loops },

   { "dns_csa_search_limit",     opt_int,         &dns_csa_search_limit },
   { "dns_csa_use_reverse",      opt_bool,        &dns_csa_use_reverse },
   { "dns_dnssec_ok",            opt_int,         &dns_dnssec_ok },
   { "dns_csa_search_limit",     opt_int,         &dns_csa_search_limit },
   { "dns_csa_use_reverse",      opt_bool,        &dns_csa_use_reverse },
   { "dns_dnssec_ok",            opt_int,         &dns_dnssec_ok },


@@ -145,13 +149,14 @@ static optionlist optionlist_config[] = {
   { "exim_group",               opt_gid,         &exim_gid },
   { "exim_path",                opt_stringptr,   &exim_path },
   { "exim_user",                opt_uid,         &exim_uid },
   { "exim_group",               opt_gid,         &exim_gid },
   { "exim_path",                opt_stringptr,   &exim_path },
   { "exim_user",                opt_uid,         &exim_uid },

+  { "exim_version",             opt_stringptr,   &version_string },

   { "extra_local_interfaces",   opt_stringptr,   &extra_local_interfaces },
   { "extract_addresses_remove_arguments", opt_bool, &extract_addresses_remove_arguments },
   { "finduser_retries",         opt_int,         &finduser_retries },
   { "freeze_tell",              opt_stringptr,   &freeze_tell },
   { "gecos_name",               opt_stringptr,   &gecos_name },
   { "gecos_pattern",            opt_stringptr,   &gecos_pattern },
   { "extra_local_interfaces",   opt_stringptr,   &extra_local_interfaces },
   { "extract_addresses_remove_arguments", opt_bool, &extract_addresses_remove_arguments },
   { "finduser_retries",         opt_int,         &finduser_retries },
   { "freeze_tell",              opt_stringptr,   &freeze_tell },
   { "gecos_name",               opt_stringptr,   &gecos_name },
   { "gecos_pattern",            opt_stringptr,   &gecos_pattern },

-#ifdef SUPPORT_TLS
+#ifndef DISABLE_TLS

   { "gnutls_allow_auto_pkcs11", opt_bool,        &gnutls_allow_auto_pkcs11 },
   { "gnutls_compat_mode",       opt_bool,        &gnutls_compat_mode },
 #endif
   { "gnutls_allow_auto_pkcs11", opt_bool,        &gnutls_allow_auto_pkcs11 },
   { "gnutls_compat_mode",       opt_bool,        &gnutls_compat_mode },
 #endif


@@ -195,7 +200,9 @@ static optionlist optionlist_config[] = {
   { "local_from_prefix",        opt_stringptr,   &local_from_prefix },
   { "local_from_suffix",        opt_stringptr,   &local_from_suffix },
   { "local_interfaces",         opt_stringptr,   &local_interfaces },
   { "local_from_prefix",        opt_stringptr,   &local_from_prefix },
   { "local_from_suffix",        opt_stringptr,   &local_from_suffix },
   { "local_interfaces",         opt_stringptr,   &local_interfaces },

+#ifdef HAVE_LOCAL_SCAN

   { "local_scan_timeout",       opt_time,        &local_scan_timeout },
   { "local_scan_timeout",       opt_time,        &local_scan_timeout },

+#endif

   { "local_sender_retain",      opt_bool,        &local_sender_retain },
   { "localhost_number",         opt_stringptr,   &host_number_string },
   { "log_file_path",            opt_stringptr,   &log_file_path },
   { "local_sender_retain",      opt_bool,        &local_sender_retain },
   { "localhost_number",         opt_stringptr,   &host_number_string },
   { "log_file_path",            opt_stringptr,   &log_file_path },


@@ -217,7 +224,7 @@ static optionlist optionlist_config[] = {
   { "mysql_servers",            opt_stringptr,   &mysql_servers },
 #endif
   { "never_users",              opt_uidlist,     &never_users },
   { "mysql_servers",            opt_stringptr,   &mysql_servers },
 #endif
   { "never_users",              opt_uidlist,     &never_users },

-#ifdef SUPPORT_TLS
+#ifndef DISABLE_TLS

   { "openssl_options",          opt_stringptr,   &openssl_options },
 #endif
 #ifdef LOOKUP_ORACLE
   { "openssl_options",          opt_stringptr,   &openssl_options },
 #endif
 #ifdef LOOKUP_ORACLE


@@ -234,6 +241,10 @@ static optionlist optionlist_config[] = {
 #endif
   { "pid_file_path",            opt_stringptr,   &pid_file_path },
   { "pipelining_advertise_hosts", opt_stringptr, &pipelining_advertise_hosts },
 #endif
   { "pid_file_path",            opt_stringptr,   &pid_file_path },
   { "pipelining_advertise_hosts", opt_stringptr, &pipelining_advertise_hosts },

+#ifdef SUPPORT_PIPE_CONNECT
+  { "pipelining_connect_advertise_hosts", opt_stringptr,
+                                                &pipe_connect_advertise_hosts },
+#endif

 #ifndef DISABLE_PRDR
   { "prdr_enable",              opt_bool,        &prdr_enable },
 #endif
 #ifndef DISABLE_PRDR
   { "prdr_enable",              opt_bool,        &prdr_enable },
 #endif


@@ -344,7 +355,7 @@ static optionlist optionlist_config[] = {
   { "timeout_frozen_after",     opt_time,        &timeout_frozen_after },
   { "timezone",                 opt_stringptr,   &timezone_string },
   { "tls_advertise_hosts",      opt_stringptr,   &tls_advertise_hosts },
   { "timeout_frozen_after",     opt_time,        &timeout_frozen_after },
   { "timezone",                 opt_stringptr,   &timezone_string },
   { "tls_advertise_hosts",      opt_stringptr,   &tls_advertise_hosts },

-#ifdef SUPPORT_TLS
+#ifndef DISABLE_TLS

   { "tls_certificate",          opt_stringptr,   &tls_certificate },
   { "tls_crl",                  opt_stringptr,   &tls_crl },
   { "tls_dh_max_bits",          opt_int,         &tls_dh_max_bits },
   { "tls_certificate",          opt_stringptr,   &tls_certificate },
   { "tls_crl",                  opt_stringptr,   &tls_crl },
   { "tls_dh_max_bits",          opt_int,         &tls_dh_max_bits },


@@ -357,6 +368,9 @@ static optionlist optionlist_config[] = {
   { "tls_privatekey",           opt_stringptr,   &tls_privatekey },
   { "tls_remember_esmtp",       opt_bool,        &tls_remember_esmtp },
   { "tls_require_ciphers",      opt_stringptr,   &tls_require_ciphers },
   { "tls_privatekey",           opt_stringptr,   &tls_privatekey },
   { "tls_remember_esmtp",       opt_bool,        &tls_remember_esmtp },
   { "tls_require_ciphers",      opt_stringptr,   &tls_require_ciphers },

+# ifdef EXPERIMENTAL_TLS_RESUME
+  { "tls_resumption_hosts",     opt_stringptr,   &tls_resumption_hosts },
+# endif

   { "tls_try_verify_hosts",     opt_stringptr,   &tls_try_verify_hosts },
   { "tls_verify_certificates",  opt_stringptr,   &tls_verify_certificates },
   { "tls_verify_hosts",         opt_stringptr,   &tls_verify_hosts },
   { "tls_try_verify_hosts",     opt_stringptr,   &tls_try_verify_hosts },
   { "tls_verify_certificates",  opt_stringptr,   &tls_verify_certificates },
   { "tls_verify_hosts",         opt_stringptr,   &tls_verify_hosts },


@@ -379,7 +393,8 @@ static int optionlist_config_size = nelem(optionlist_config);
 
 #ifdef MACRO_PREDEF
 
 
 #ifdef MACRO_PREDEF
 

-static void fn_smtp_receive_timeout(const uschar * name, const uschar * str) {/*Dummy*/}
+static void
+fn_smtp_receive_timeout(const uschar * name, const uschar * str, unsigned flags) {/*Dummy*/}

 
 void
 options_main(void)
 
 void
 options_main(void)


@@ -390,12 +405,11 @@ options_from_list(optionlist_config, nelem(optionlist_config), US"MAIN", NULL);
 void
 options_auths(void)
 {
 void
 options_auths(void)
 {

-struct auth_info * ai;

 uschar buf[64];
 
 options_from_list(optionlist_auths, optionlist_auths_size, US"AUTHENTICATORS", NULL);
 
 uschar buf[64];
 
 options_from_list(optionlist_auths, optionlist_auths_size, US"AUTHENTICATORS", NULL);
 

-for (ai = auths_available; ai->driver_name[0]; ai++)
+for (struct auth_info * ai = auths_available; ai->driver_name[0]; ai++)

   {
   spf(buf, sizeof(buf), US"_DRIVER_AUTHENTICATOR_%T", ai->driver_name);
   builtin_macro_create(buf);
   {
   spf(buf, sizeof(buf), US"_DRIVER_AUTHENTICATOR_%T", ai->driver_name);
   builtin_macro_create(buf);


@@ -403,6 +417,18 @@ for (ai = auths_available; ai->driver_name[0]; ai++)
   }
 }
 
   }
 }
 

+void
+options_logging(void)
+{
+uschar buf[64];
+
+for (bit_table * bp = log_options; bp < log_options + log_options_count; bp++)
+  {
+  spf(buf, sizeof(buf), US"_LOG_%T", bp->name);
+  builtin_macro_create(buf);
+  }
+}
+

 
 #else  /*!MACRO_PREDEF*/
 
 
 #else  /*!MACRO_PREDEF*/
 


@@ -533,6 +559,8 @@ static syslog_fac_item syslog_list[] = {
 static int syslog_list_size = sizeof(syslog_list)/sizeof(syslog_fac_item);
 
 
 static int syslog_list_size = sizeof(syslog_list)/sizeof(syslog_fac_item);
 
 

+#define opt_fn_print           BIT(0)
+#define opt_fn_print_label     BIT(1)

 
 
 /*************************************************
 
 
 /*************************************************


@@ -552,17 +580,13 @@ Returns:     the option name, or an empty string
 uschar *
 readconf_find_option(void *p)
 {
 uschar *
 readconf_find_option(void *p)
 {

-int i;
-router_instance *r;
-transport_instance *t;
-
-for (i = 0; i < nelem(optionlist_config); i++)
+for (int i = 0; i < nelem(optionlist_config); i++)

   if (p == optionlist_config[i].value) return US optionlist_config[i].name;
 
   if (p == optionlist_config[i].value) return US optionlist_config[i].name;
 

-for (r = routers; r; r = r->next)
+for (router_instance * r = routers; r; r = r->next)

   {
   router_info *ri = r->info;
   {
   router_info *ri = r->info;

-  for (i = 0; i < *ri->options_count; i++)
+  for (int i = 0; i < *ri->options_count; i++)

     {
     if ((ri->options[i].type & opt_mask) != opt_stringptr) continue;
     if (p == CS (r->options_block) + (long int)(ri->options[i].value))
     {
     if ((ri->options[i].type & opt_mask) != opt_stringptr) continue;
     if (p == CS (r->options_block) + (long int)(ri->options[i].value))


@@ -570,10 +594,10 @@ for (r = routers; r; r = r->next)
     }
   }
 
     }
   }
 

-for (t = transports; t; t = t->next)
+for (transport_instance * t = transports; t; t = t->next)

   {
   transport_info *ti = t->info;
   {
   transport_info *ti = t->info;

-  for (i = 0; i < *ti->options_count; i++)
+  for (int i = 0; i < *ti->options_count; i++)

     {
     optionlist * op = &ti->options[i];
     if ((op->type & opt_mask) != opt_stringptr) continue;
     {
     optionlist * op = &ti->options[i];
     if ((op->type & opt_mask) != opt_stringptr) continue;


@@ -592,6 +616,40 @@ return US"";
 
 
 
 
 
 

+/*************************************************
+*       Deal with an assignment to a macro       *
+*************************************************/
+
+/* We have a new definition; append to the list.
+
+Args:
+ name  Name of the macro; will be copied
+ val   Expansion result for the macro; will be copied
+*/
+
+macro_item *
+macro_create(const uschar * name, const uschar * val, BOOL command_line)
+{
+macro_item * m = store_get(sizeof(macro_item), FALSE);
+
+READCONF_DEBUG fprintf(stderr, "%s: '%s' '%s'\n", __FUNCTION__, name, val);
+m->next = NULL;
+m->command_line = command_line;
+m->namelen = Ustrlen(name);
+m->replen = Ustrlen(val);
+m->name = string_copy(name);
+m->replacement = string_copy(val);
+if (mlast)
+  mlast->next = m;
+else
+  macros = m;
+mlast = m;
+if (!macros_user)
+  macros_user = m;
+return m;
+}
+
+

 /* This function is called when a line that starts with an upper case letter is
 encountered. The argument "line" should contain a complete logical line, and
 start with the first letter of the macro name. The macro name and the
 /* This function is called when a line that starts with an upper case letter is
 encountered. The argument "line" should contain a complete logical line, and
 start with the first letter of the macro name. The macro name and the


@@ -642,37 +700,53 @@ while (isspace(*s)) s++;
 just skip this definition. It's an error to attempt to redefine a macro without
 redef set to TRUE, or to redefine a macro when it hasn't been defined earlier.
 It is also an error to define a macro whose name begins with the name of a
 just skip this definition. It's an error to attempt to redefine a macro without
 redef set to TRUE, or to redefine a macro when it hasn't been defined earlier.
 It is also an error to define a macro whose name begins with the name of a

-previously defined macro.
+previously defined macro.  This is the requirement that make using a tree
+for macros hard; we must check all macros for the substring.  Perhaps a
+sorted list, and a bsearch, would work?

 Note: it is documented that the other way round works. */
 
 Note: it is documented that the other way round works. */
 

-if ((m = macro_search_prefix(name)))
+for (m = macros; m; m = m->next)

   {
   {

-  if (m->namelen < namelen)    /* substring match */
+  if (Ustrcmp(m->name, name) == 0)

     {
     {

-    log_write(0, LOG_CONFIG|LOG_PANIC, "\"%s\" cannot be defined as "
-      "a macro because previously defined macro \"%s\" is a substring",
-      name, m->tnode.name);
-    return FALSE;
+    if (!m->command_line && !redef)
+      {
+      log_write(0, LOG_CONFIG|LOG_PANIC, "macro \"%s\" is already "
+       "defined (use \"==\" if you want to redefine it)", name);
+      return FALSE;
+      }
+    break;

     }
     }

-                               /* exact match */
-  if (!m->command_line && !redef)
+
+  if (m->namelen < namelen && Ustrstr(name, m->name) != NULL)

     {
     {

-    log_write(0, LOG_CONFIG|LOG_PANIC, "macro \"%s\" is already "
-       "defined (use \"==\" if you want to redefine it", name);
+    log_write(0, LOG_CONFIG|LOG_PANIC, "\"%s\" cannot be defined as "
+      "a macro because previously defined macro \"%s\" is a substring",
+      name, m->name);

     return FALSE;
     }
 
     return FALSE;
     }
 

-  if (m->command_line)         /* overriding cmdline definition */
-    return TRUE;
+  /* We cannot have this test, because it is documented that a substring
+  macro is permitted (there is even an example).
+  *
+  * if (m->namelen > namelen && Ustrstr(m->name, name) != NULL)
+  *   log_write(0, LOG_CONFIG|LOG_PANIC_DIE, "\"%s\" cannot be defined as "
+  *     "a macro because it is a substring of previously defined macro \"%s\"",
+  *     name, m->name);
+  */

   }
 
   }
 

+/* Check for an overriding command-line definition. */
+
+if (m && m->command_line) return TRUE;
+

 /* Redefinition must refer to an existing macro. */
 
 if (redef)
   if (m)
     {
     m->replen = Ustrlen(s);
 /* Redefinition must refer to an existing macro. */
 
 if (redef)
   if (m)
     {
     m->replen = Ustrlen(s);

-    m->tnode.data.ptr = string_copy(s);
+    m->replacement = string_copy(s);

     }
   else
     {
     }
   else
     {


@@ -693,7 +767,7 @@ return TRUE;
 
 /* Process line for macros. The line is in big_buffer starting at offset len.
 Expand big_buffer if needed.  Handle definitions of new macros, and
 
 /* Process line for macros. The line is in big_buffer starting at offset len.
 Expand big_buffer if needed.  Handle definitions of new macros, and

-imacro expansions, rewriting the line in thw buffer.
+macro expansions, rewriting the line in the buffer.

 
 Arguments:
  len           Offset in buffer of start of line
 
 Arguments:
  len           Offset in buffer of start of line


@@ -728,52 +802,61 @@ if (len == 0 && isupper(*s))
   if (*s != '=') s = ss;          /* Not a macro definition */
   }
 
   if (*s != '=') s = ss;          /* Not a macro definition */
   }
 

-/* Scan the line (from after XXX= if present), replacing any macros. Rescan
-after replacement for any later-defined macros. */
+/* Skip leading chars which cannot start a macro name, to avoid multiple
+pointless rescans in Ustrstr calls. */
+
+while (*s && !isupper(*s) && !(*s == '_' && isupper(s[1]))) s++;
+
+/* For each defined macro, scan the line (from after XXX= if present),
+replacing all occurrences of the macro. */

 
 *macro_found = FALSE;
 
 *macro_found = FALSE;

-while (*s)
+if (*s) for (macro_item * m = *s == '_' ? macros : macros_user; m; m = m->next)

   {
   {

-  if (isupper(*s) || *s == '_' && isupper(s[1]))
-    {
-    macro_item * m;
-    unsigned mnum = 0;
+  uschar * p, *pp;
+  uschar * t;

 
 

-    while ((m = macro_search_largest_prefix(s)) && m->m_number > mnum)
-      {
-      uschar * pp;
-      int moveby;
+  while (*s && !isupper(*s) && !(*s == '_' && isupper(s[1]))) s++;
+  if (!*s) break;

 
 

-      /* Expand the buffer if necessary */
+  t = s;
+  while ((p = Ustrstr(t, m->name)) != NULL)
+    {
+    int moveby;

 
 

-      while (*newlen - m->namelen + m->replen + 1 > big_buffer_size)
-       {
-       int newsize = big_buffer_size + BIG_BUFFER_SIZE;
-       uschar *newbuffer = store_malloc(newsize);
-       memcpy(newbuffer, big_buffer, *newlen + 1);
-       s = newbuffer  + (s - big_buffer);
-       ss = newbuffer + (ss - big_buffer);
-       big_buffer_size = newsize;
-       store_free(big_buffer);
-       big_buffer = newbuffer;
-       }
+    READCONF_DEBUG fprintf(stderr, "%s: matched '%s' in '%.*s'\n", __FUNCTION__,
+      m->name, (int) Ustrlen(ss)-1, ss);
+    /* Expand the buffer if necessary */

 
 

-      /* Shuffle the remaining characters up or down in the buffer before
-      copying in the replacement text. Don't rescan the replacement for this
-      same macro. */
+    while (*newlen - m->namelen + m->replen + 1 > big_buffer_size)
+      {
+      int newsize = big_buffer_size + BIG_BUFFER_SIZE;
+      uschar *newbuffer = store_malloc(newsize);
+      memcpy(newbuffer, big_buffer, *newlen + 1);
+      p = newbuffer  + (p - big_buffer);
+      s = newbuffer  + (s - big_buffer);
+      ss = newbuffer + (ss - big_buffer);
+      t = newbuffer  + (t - big_buffer);
+      big_buffer_size = newsize;
+      store_free(big_buffer);
+      big_buffer = newbuffer;
+      }

 
 

-      pp = s + m->namelen;
-      if ((moveby = m->replen - m->namelen) != 0)
-       {
-       memmove(s + m->replen, pp, (big_buffer + *newlen) - pp + 1);
-       *newlen += moveby;
-       }
-      Ustrncpy(s, m->tnode.data.ptr, m->replen);
-      *macro_found = TRUE;
-      mnum = m->m_number;
+    /* Shuffle the remaining characters up or down in the buffer before
+    copying in the replacement text. Don't rescan the replacement for this
+    same macro. */
+
+    pp = p + m->namelen;
+    if ((moveby = m->replen - m->namelen) != 0)
+      {
+      memmove(p + m->replen, pp, (big_buffer + *newlen) - pp + 1);
+      *newlen += moveby;

       }
       }

+    Ustrncpy(p, m->replacement, m->replen);
+    t = p + m->replen;
+    while (*t && !isupper(*t) && !(*t == '_' && isupper(t[1]))) t++;
+    *macro_found = TRUE;

     }
     }

-  s++;

   }
 
 /* An empty macro replacement at the start of a line could mean that ss no
   }
 
 /* An empty macro replacement at the start of a line could mean that ss no


@@ -880,7 +963,7 @@ for (;;)
 
   /* Handle conditionals, which are also applied to physical lines. Conditions
   are of the form ".ifdef ANYTEXT" and are treated as true if any macro
 
   /* Handle conditionals, which are also applied to physical lines. Conditions
   are of the form ".ifdef ANYTEXT" and are treated as true if any macro

-  expansion occured on the rest of the line. A preliminary test for the leading
+  expansion occurred on the rest of the line. A preliminary test for the leading

   '.' saves effort on most lines. */
 
   if (*ss == '.')
   '.' saves effort on most lines. */
 
   if (*ss == '.')


@@ -978,7 +1061,7 @@ for (;;)
 
     if (config_lines)
       save_config_position(config_filename, config_lineno);
 
     if (config_lines)
       save_config_position(config_filename, config_lineno);

-    save = store_get(sizeof(config_file_item));
+    save = store_get(sizeof(config_file_item), FALSE);

     save->next = config_file_stack;
     config_file_stack = save;
     save->file = config_file;
     save->next = config_file_stack;
     config_file_stack = save;
     save->file = config_file;


@@ -1318,7 +1401,7 @@ Returns:      the control block for the parsed rule.
 static rewrite_rule *
 readconf_one_rewrite(const uschar *p, int *existflags, BOOL isglobal)
 {
 static rewrite_rule *
 readconf_one_rewrite(const uschar *p, int *existflags, BOOL isglobal)
 {

-rewrite_rule *next = store_get(sizeof(rewrite_rule));
+rewrite_rule *next = store_get(sizeof(rewrite_rule), FALSE);

 
 next->next = NULL;
 next->key = string_dequote(&p);
 
 next->next = NULL;
 next->key = string_dequote(&p);


@@ -1446,9 +1529,16 @@ return yield;
 *            Custom-handler options              *
 *************************************************/
 static void
 *            Custom-handler options              *
 *************************************************/
 static void

-fn_smtp_receive_timeout(const uschar * name, const uschar * str)
+fn_smtp_receive_timeout(const uschar * name, const uschar * str, unsigned flags)

 {
 {

-if (*str == '$')
+if (flags & opt_fn_print)
+  {
+  if (flags & opt_fn_print_label) printf("%s = ", name);
+  printf("%s\n", smtp_receive_timeout_s
+    ? string_printing2(smtp_receive_timeout_s, FALSE)
+    : readconf_printtime(smtp_receive_timeout));
+  }
+else if (*str == '$')

   smtp_receive_timeout_s = string_copy(str);
 else
   {
   smtp_receive_timeout_s = string_copy(str);
 else
   {


@@ -1505,7 +1595,7 @@ readconf_handle_option(uschar *buffer, optionlist *oltop, int last,
 {
 int ptr = 0;
 int offset = 0;
 {
 int ptr = 0;
 int offset = 0;

-int n, count, type, value;
+int count, type, value;

 int issecure = 0;
 uid_t uid;
 gid_t gid;
 int issecure = 0;
 uid_t uid;
 gid_t gid;


@@ -1513,7 +1603,7 @@ BOOL boolvalue = TRUE;
 BOOL freesptr = TRUE;
 optionlist *ol, *ol2;
 struct passwd *pw;
 BOOL freesptr = TRUE;
 optionlist *ol, *ol2;
 struct passwd *pw;

-void *reset_point;
+rmark reset_point;

 int intbase = 0;
 uschar *inttype = US"";
 uschar *sptr;
 int intbase = 0;
 uschar *inttype = US"";
 uschar *sptr;


@@ -1533,7 +1623,7 @@ if (!isalpha(*s))
 it turns out that what we read was "hide", set the flag indicating that
 this is a secure option, and loop to read the next word. */
 
 it turns out that what we read was "hide", set the flag indicating that
 this is a secure option, and loop to read the next word. */
 

-for (n = 0; n < 2; n++)
+for (int n = 0; n < 2; n++)

   {
   while (isalnum(*s) || *s == '_')
     {
   {
   while (isalnum(*s) || *s == '_')
     {


@@ -1637,7 +1727,8 @@ switch (type)
   case opt_gidlist:
   case opt_rewrite:
 
   case opt_gidlist:
   case opt_rewrite:
 

-  reset_point = sptr = read_string(s, name);
+  reset_point = store_mark();
+  sptr = read_string(s, name);

 
   /* Having read a string, we now have several different ways of using it,
   depending on the data type, so do another switch. If keeping the actual
 
   /* Having read a string, we now have several different ways of using it,
   depending on the data type, so do another switch. If keeping the actual


@@ -1660,10 +1751,11 @@ switch (type)
       /* We already have a condition, we're conducting a crude hack to let
       multiple condition rules be chained together, despite storing them in
       text form. */
       /* We already have a condition, we're conducting a crude hack to let
       multiple condition rules be chained together, despite storing them in
       text form. */

-      *str_target = string_copy_malloc( (saved_condition = *str_target)
+      *str_target = string_copy_perm( (saved_condition = *str_target)

        ? string_sprintf("${if and{{bool_lax{%s}}{bool_lax{%s}}}}",
            saved_condition, sptr)
        ? string_sprintf("${if and{{bool_lax{%s}}{bool_lax{%s}}}}",
            saved_condition, sptr)

-       : sptr);
+       : sptr,
+       FALSE);

       /* TODO(pdp): there is a memory leak here and just below
       when we set 3 or more conditions; I still don't
       understand the store mechanism enough to know
       /* TODO(pdp): there is a memory leak here and just below
       when we set 3 or more conditions; I still don't
       understand the store mechanism enough to know


@@ -1680,7 +1772,10 @@ switch (type)
       }
     else if (ol->type & opt_rep_str)
       {
       }
     else if (ol->type & opt_rep_str)
       {

-      uschar sep_o = Ustrncmp(name, "headers_add", 11)==0 ? '\n' : ':';
+      uschar sep_o =
+       Ustrncmp(name, "headers_add", 11) == 0  ? '\n'
+       : Ustrncmp(name, "set", 3) == 0         ? ';'
+       : ':';

       int    sep_i = -(int)sep_o;
       const uschar * list = sptr;
       uschar * s;
       int    sep_i = -(int)sep_o;
       const uschar * list = sptr;
       uschar * s;


@@ -1696,7 +1791,7 @@ switch (type)
        list_o = string_append_listele(list_o, sep_o, s);
 
       if (list_o)
        list_o = string_append_listele(list_o, sep_o, s);
 
       if (list_o)

-       *str_target = string_copy_malloc(string_from_gstring(list_o));
+       *str_target = string_copy_perm(string_from_gstring(list_o), FALSE);

       }
     else
       {
       }
     else
       {


@@ -1798,7 +1893,7 @@ switch (type)
     ignore. Also ignore if the value is already set. */
 
     if (pw == NULL) break;
     ignore. Also ignore if the value is already set. */
 
     if (pw == NULL) break;

-    Ustrcpy(name+Ustrlen(name)-4, "group");
+    Ustrcpy(name+Ustrlen(name)-4, US"group");

     ol2 = find_option(name, oltop, last);
     if (ol2 != NULL && ((ol2->type & opt_mask) == opt_gid ||
         (ol2->type & opt_mask) == opt_expand_gid))
     ol2 = find_option(name, oltop, last);
     if (ol2 != NULL && ((ol2->type & opt_mask) == opt_gid ||
         (ol2->type & opt_mask) == opt_expand_gid))


@@ -1938,7 +2033,7 @@ switch (type)
 
   /* Release store if the value of the string doesn't need to be kept. */
 
 
   /* Release store if the value of the string doesn't need to be kept. */
 

-  if (freesptr) store_reset(reset_point);
+  if (freesptr) reset_point = store_reset(reset_point);

   break;
 
   /* Expanded boolean: if no characters follow, or if there are no dollar
   break;
 
   /* Expanded boolean: if no characters follow, or if there are no dollar


@@ -1949,10 +2044,10 @@ switch (type)
   if (*s != 0 && Ustrchr(s, '$') != 0)
     {
     sprintf(CS name2, "*expand_%.50s", name);
   if (*s != 0 && Ustrchr(s, '$') != 0)
     {
     sprintf(CS name2, "*expand_%.50s", name);

-    ol2 = find_option(name2, oltop, last);
-    if (ol2 != NULL)
+    if ((ol2 = find_option(name2, oltop, last)))

       {
       {

-      reset_point = sptr = read_string(s, name);
+      reset_point = store_mark();
+      sptr = read_string(s, name);

       if (data_block == NULL)
         *((uschar **)(ol2->value)) = sptr;
       else
       if (data_block == NULL)
         *((uschar **)(ol2->value)) = sptr;
       else


@@ -2044,7 +2139,7 @@ switch (type)
   inttype = US"octal ";
 
   /*  Integer: a simple(ish) case; allow octal and hex formats, and
   inttype = US"octal ";
 
   /*  Integer: a simple(ish) case; allow octal and hex formats, and

-  suffixes K, M and G. The different types affect output, not input. */
+  suffixes K, M, G, and T.  The different types affect output, not input. */

 
   case opt_mkint:
   case opt_int:
 
   case opt_mkint:
   case opt_int:


@@ -2059,80 +2154,75 @@ switch (type)
       log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN, "%sinteger expected for %s",
         inttype, name);
 
       log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN, "%sinteger expected for %s",
         inttype, name);
 

-    if (errno != ERANGE)
-      if (tolower(*endptr) == 'k')
-        {
-        if (lvalue > INT_MAX/1024 || lvalue < INT_MIN/1024) errno = ERANGE;
-          else lvalue *= 1024;
-        endptr++;
-        }
-      else if (tolower(*endptr) == 'm')
-        {
-        if (lvalue > INT_MAX/(1024*1024) || lvalue < INT_MIN/(1024*1024))
-          errno = ERANGE;
-        else lvalue *= 1024*1024;
-        endptr++;
-        }
-      else if (tolower(*endptr) == 'g')
-        {
-        if (lvalue > INT_MAX/(1024*1024*1024) || lvalue < INT_MIN/(1024*1024*1024))
-          errno = ERANGE;
-        else lvalue *= 1024*1024*1024;
-        endptr++;
-        }
+    if (errno != ERANGE && *endptr)
+      {
+      uschar * mp = US"TtGgMmKk\0";    /* YyZzEePpTtGgMmKk */
+
+      if ((mp = Ustrchr(mp, *endptr)))
+       {
+       endptr++;
+       do
+         {
+         if (lvalue > INT_MAX/1024 || lvalue < INT_MIN/1024)
+           {
+           errno = ERANGE;
+           break;
+           }
+         lvalue *= 1024;
+         }
+       while (*(mp += 2));
+       }
+      }

 
     if (errno == ERANGE || lvalue > INT_MAX || lvalue < INT_MIN)
       log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN,
         "absolute value of integer \"%s\" is too large (overflow)", s);
 
     while (isspace(*endptr)) endptr++;
 
     if (errno == ERANGE || lvalue > INT_MAX || lvalue < INT_MIN)
       log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN,
         "absolute value of integer \"%s\" is too large (overflow)", s);
 
     while (isspace(*endptr)) endptr++;

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

       extra_chars_error(endptr, inttype, US"integer value for ", name);
 
     value = (int)lvalue;
     }
 
       extra_chars_error(endptr, inttype, US"integer value for ", name);
 
     value = (int)lvalue;
     }
 

-  if (data_block == NULL)
-    *((int *)(ol->value)) = value;
+  if (data_block)
+    *(int *)(US data_block + (long int)ol->value) = value;

   else
   else

-    *((int *)(US data_block + (long int)(ol->value))) = value;
+    *(int *)ol->value = value;

   break;
 
   break;
 

-  /*  Integer held in K: again, allow octal and hex formats, and suffixes K, M
-  and G. */
-  /*XXX consider moving to int_eximarith_t (but mind the overflow test 0415) */
+  /*  Integer held in K: again, allow formats and suffixes as above. */

 
   case opt_Kint:
     {
     uschar *endptr;
     errno = 0;
 
   case opt_Kint:
     {
     uschar *endptr;
     errno = 0;

-    value = strtol(CS s, CSS &endptr, intbase);
+    int_eximarith_t lvalue = strtol(CS s, CSS &endptr, intbase);

 
     if (endptr == s)
       log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN, "%sinteger expected for %s",
         inttype, name);
 
 
     if (endptr == s)
       log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN, "%sinteger expected for %s",
         inttype, name);
 

-    if (errno != ERANGE)
-      if (tolower(*endptr) == 'g')
-        {
-        if (value > INT_MAX/(1024*1024) || value < INT_MIN/(1024*1024))
-         errno = ERANGE;
-       else
-         value *= 1024*1024;
-        endptr++;
-        }
-      else if (tolower(*endptr) == 'm')
-        {
-        if (value > INT_MAX/1024 || value < INT_MIN/1024)
-         errno = ERANGE;
-       else
-         value *= 1024;
-        endptr++;
-        }
-      else if (tolower(*endptr) == 'k')
-        endptr++;
+    if (errno != ERANGE && *endptr)
+      {
+      uschar * mp = US"ZzEePpTtGgMmKk\0";      /* YyZzEePpTtGgMmKk */
+
+      if ((mp = Ustrchr(mp, *endptr)))
+       {
+       endptr++;
+       while (*(mp += 2))
+         {
+         if (lvalue > EXIM_ARITH_MAX/1024 || lvalue < EXIM_ARITH_MIN/1024)
+           {
+           errno = ERANGE;
+           break;
+           }
+         lvalue *= 1024;
+         }
+       }

       else
       else

-        value = (value + 512)/1024;
+       lvalue = (lvalue + 512)/1024;
+      }

 
     if (errno == ERANGE) log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN,
       "absolute value of integer \"%s\" is too large (overflow)", s);
 
     if (errno == ERANGE) log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN,
       "absolute value of integer \"%s\" is too large (overflow)", s);


@@ -2140,13 +2230,13 @@ switch (type)
     while (isspace(*endptr)) endptr++;
     if (*endptr != 0)
       extra_chars_error(endptr, inttype, US"integer value for ", name);
     while (isspace(*endptr)) endptr++;
     if (*endptr != 0)
       extra_chars_error(endptr, inttype, US"integer value for ", name);

-    }

 
 

-  if (data_block == NULL)
-    *((int *)(ol->value)) = value;
-  else
-    *((int *)(US data_block + (long int)(ol->value))) = value;
-  break;
+    if (data_block)
+      *(int_eximarith_t *)(US data_block + (long int)ol->value) = lvalue;
+    else
+      *(int_eximarith_t *)ol->value = lvalue;
+    break;
+    }

 
   /*  Fixed-point number: held to 3 decimal places. */
 
 
   /*  Fixed-point number: held to 3 decimal places. */
 


@@ -2247,7 +2337,7 @@ switch (type)
   case opt_func:
     {
     void (*fn)() = ol->value;
   case opt_func:
     {
     void (*fn)() = ol->value;

-    fn(name, s);
+    fn(name, s, 0);

     break;
     }
   }
     break;
     }
   }


@@ -2345,7 +2435,7 @@ if (!ol)
 /* Non-admin callers cannot see options that have been flagged secure by the
 "hide" prefix. */
 
 /* Non-admin callers cannot see options that have been flagged secure by the
 "hide" prefix. */
 

-if (!admin_user && ol->type & opt_secure)
+if (!f.admin_user && ol->type & opt_secure)

   {
   if (no_labels)
     printf("%s\n", hidden);
   {
   if (no_labels)
     printf("%s\n", hidden);


@@ -2403,11 +2493,13 @@ switch(ol->type & opt_mask)
 
   case opt_Kint:
     {
 
   case opt_Kint:
     {

-    int x = *((int *)value);
+    int_eximarith_t x = *((int_eximarith_t *)value);

     if (!no_labels) printf("%s = ", name);
     if (x == 0) printf("0\n");
     if (!no_labels) printf("%s = ", name);
     if (x == 0) printf("0\n");

-    else if ((x & 1023) == 0) printf("%dM\n", x >> 10);
-    else printf("%dK\n", x);
+    else if ((x & ((1<<30)-1)) == 0) printf(PR_EXIM_ARITH "T\n", x >> 30);
+    else if ((x & ((1<<20)-1)) == 0) printf(PR_EXIM_ARITH "G\n", x >> 20);
+    else if ((x & ((1<<10)-1)) == 0) printf(PR_EXIM_ARITH "M\n", x >> 10);
+    else printf(PR_EXIM_ARITH "K\n", x);

     }
     break;
 
     }
     break;
 


@@ -2507,9 +2599,8 @@ switch(ol->type & opt_mask)
     if (!no_labels) printf("%s =", name);
     if (uidlist)
       {
     if (!no_labels) printf("%s =", name);
     if (uidlist)
       {

-      int i;

       uschar sep = no_labels ? '\0' : ' ';
       uschar sep = no_labels ? '\0' : ' ';

-      for (i = 1; i <= (int)(uidlist[0]); i++)
+      for (int i = 1; i <= (int)(uidlist[0]); i++)

        {
        uschar *name = NULL;
        if ((pw = getpwuid(uidlist[i]))) name = US pw->pw_name;
        {
        uschar *name = NULL;
        if ((pw = getpwuid(uidlist[i]))) name = US pw->pw_name;


@@ -2527,9 +2618,8 @@ switch(ol->type & opt_mask)
     if (!no_labels) printf("%s =", name);
     if (gidlist)
       {
     if (!no_labels) printf("%s =", name);
     if (gidlist)
       {

-      int i;

       uschar sep = no_labels ? '\0' : ' ';
       uschar sep = no_labels ? '\0' : ' ';

-      for (i = 1; i <= (int)(gidlist[0]); i++)
+      for (int i = 1; i <= (int)(gidlist[0]); i++)

        {
        uschar *name = NULL;
        if ((gr = getgrgid(gidlist[i]))) name = US gr->gr_name;
        {
        uschar *name = NULL;
        if ((gr = getgrgid(gidlist[i]))) name = US gr->gr_name;


@@ -2549,10 +2639,9 @@ switch(ol->type & opt_mask)
 
   case opt_timelist:
     {
 
   case opt_timelist:
     {

-    int i;

     int *list = (int *)value;
     if (!no_labels) printf("%s = ", name);
     int *list = (int *)value;
     if (!no_labels) printf("%s = ", name);

-    for (i = 0; i < list[1]; i++)
+    for (int i = 0; i < list[1]; i++)

       printf("%s%s", i == 0 ? "" : ":", readconf_printtime(list[i+2]));
     printf("\n");
     }
       printf("%s%s", i == 0 ? "" : ":", readconf_printtime(list[i+2]));
     printf("\n");
     }


@@ -2587,6 +2676,13 @@ switch(ol->type & opt_mask)
   case opt_bool_set:
     printf("%s%s\n", (*((BOOL *)value))? "" : "no_", name);
     break;
   case opt_bool_set:
     printf("%s%s\n", (*((BOOL *)value))? "" : "no_", name);
     break;

+
+  case opt_func:
+    {
+    void (*fn)() = ol->value;
+    fn(name, NULL, no_labels ? opt_fn_print : opt_fn_print|opt_fn_print_label);
+    break;
+    }

   }
 return TRUE;
 }
   }
 return TRUE;
 }


@@ -2634,17 +2730,14 @@ BOOL
 readconf_print(uschar *name, uschar *type, BOOL no_labels)
 {
 BOOL names_only = FALSE;
 readconf_print(uschar *name, uschar *type, BOOL no_labels)
 {
 BOOL names_only = FALSE;

-optionlist *ol;

 optionlist *ol2 = NULL;
 driver_instance *d = NULL;
 optionlist *ol2 = NULL;
 driver_instance *d = NULL;

-macro_item *m;

 int size = 0;
 
 if (!type)
   {
   if (*name == '+')
     {
 int size = 0;
 
 if (!type)
   {
   if (*name == '+')
     {

-    int i;

     tree_node *t;
     BOOL found = FALSE;
     static uschar *types[] = { US"address", US"domain", US"host",
     tree_node *t;
     BOOL found = FALSE;
     static uschar *types[] = { US"address", US"domain", US"host",


@@ -2652,7 +2745,7 @@ if (!type)
     static tree_node **anchors[] = { &addresslist_anchor, &domainlist_anchor,
       &hostlist_anchor, &localpartlist_anchor };
 
     static tree_node **anchors[] = { &addresslist_anchor, &domainlist_anchor,
       &hostlist_anchor, &localpartlist_anchor };
 

-    for (i = 0; i < 4; i++)
+    for (int i = 0; i < 4; i++)

       if ((t = tree_search(*(anchors[i]), name+1)))
         {
         found = TRUE;
       if ((t = tree_search(*(anchors[i]), name+1)))
         {
         found = TRUE;


@@ -2679,7 +2772,7 @@ if (!type)
 
   if (Ustrcmp(name, "all") == 0)
     {
 
   if (Ustrcmp(name, "all") == 0)
     {

-    for (ol = optionlist_config;
+    for (optionlist * ol = optionlist_config;

          ol < optionlist_config + nelem(optionlist_config); ol++)
       if (!(ol->type & opt_hidden))
         (void) print_ol(ol, US ol->name, NULL,
          ol < optionlist_config + nelem(optionlist_config); ol++)
       if (!(ol->type & opt_hidden))
         (void) print_ol(ol, US ol->name, NULL,


@@ -2694,7 +2787,7 @@ if (!type)
     printf("local_scan() options are not supported\n");
     return FALSE;
 #else
     printf("local_scan() options are not supported\n");
     return FALSE;
 #else

-    for (ol = local_scan_options;
+    for (optionlist * ol = local_scan_options;

          ol < local_scan_options + local_scan_options_count; ol++)
       (void) print_ol(ol, US ol->name, NULL, local_scan_options,
                  local_scan_options_count, no_labels);
          ol < local_scan_options + local_scan_options_count; ol++)
       (void) print_ol(ol, US ol->name, NULL, local_scan_options,
                  local_scan_options_count, no_labels);


@@ -2704,7 +2797,7 @@ if (!type)
 
   if (Ustrcmp(name, "config") == 0)
     {
 
   if (Ustrcmp(name, "config") == 0)
     {

-    print_config(admin_user, no_labels);
+    print_config(f.admin_user, no_labels);

     return TRUE;
     }
 
     return TRUE;
     }
 


@@ -2805,30 +2898,33 @@ else if (Ustrcmp(type, "macro") == 0)
   {
   /* People store passwords in macros and they were previously not available
   for printing.  So we have an admin_users restriction. */
   {
   /* People store passwords in macros and they were previously not available
   for printing.  So we have an admin_users restriction. */

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

     {
     fprintf(stderr, "exim: permission denied\n");
     return FALSE;
     }
     {
     fprintf(stderr, "exim: permission denied\n");
     return FALSE;
     }

-
-  if (name)
-    if ((m = macro_search(name)))
-      macro_print(m->tnode.name, m->tnode.data.ptr, (void *)(long)names_only);
-    else
+  for (macro_item * m = macros; m; m = m->next)
+    if (!name || Ustrcmp(name, m->name) == 0)

       {
       {

-      printf("%s %s not found\n", type, name);
-      return FALSE;
+      if (names_only)
+        printf("%s\n", CS m->name);
+      else if (no_labels)
+        printf("%s\n", CS m->replacement);
+      else
+        printf("%s=%s\n", CS m->name, CS m->replacement);
+      if (name)
+        return TRUE;

       }
       }

-  else
-    tree_walk(tree_macros, macro_print, (void *)(long)names_only);
+  if (!name) return TRUE;

 
 

-  return TRUE;
+  printf("%s %s not found\n", type, name);
+  return FALSE;

   }
 
 if (names_only)
   {
   for (; d; d = d->next) printf("%s\n", CS d->name);
   }
 
 if (names_only)
   {
   for (; d; d = d->next) printf("%s\n", CS d->name);

-  return TRUE;;
+  return TRUE;

   }
 
 /* Either search for a given driver, or print all of them */
   }
 
 /* Either search for a given driver, or print all of them */


@@ -2838,14 +2934,13 @@ for (; d; d = d->next)
   BOOL rc = FALSE;
   if (!name)
     printf("\n%s %s:\n", d->name, type);
   BOOL rc = FALSE;
   if (!name)
     printf("\n%s %s:\n", d->name, type);

-  else if (Ustrcmp(d->name, name) != 0)
-    continue;
+  else if (Ustrcmp(d->name, name) != 0) continue;

 
 

-  for (ol = ol2; ol < ol2 + size; ol++)
+  for (optionlist * ol = ol2; ol < ol2 + size; ol++)

     if (!(ol->type & opt_hidden))
       rc |= print_ol(ol, US ol->name, d, ol2, size, no_labels);
 
     if (!(ol->type & opt_hidden))
       rc |= print_ol(ol, US ol->name, d, ol2, size, no_labels);
 

-  for (ol = d->info->options;
+  for (optionlist * ol = d->info->options;

        ol < d->info->options + *(d->info->options_count); ol++)
     if (!(ol->type & opt_hidden))
       rc |= print_ol(ol, US ol->name, d, d->info->options,
        ol < d->info->options + *(d->info->options_count); ol++)
     if (!(ol->type & opt_hidden))
       rc |= print_ol(ol, US ol->name, d, d->info->options,


@@ -2890,7 +2985,7 @@ read_named_list(tree_node **anchorp, int *numberp, int max, uschar *s,
 BOOL forcecache = FALSE;
 uschar *ss;
 tree_node *t;
 BOOL forcecache = FALSE;
 uschar *ss;
 tree_node *t;

-namedlist_block *nb = store_get(sizeof(namedlist_block));
+namedlist_block *nb = store_get(sizeof(namedlist_block), FALSE);

 
 if (Ustrncmp(s, "_cache", 6) == 0)
   {
 
 if (Ustrncmp(s, "_cache", 6) == 0)
   {


@@ -2908,7 +3003,7 @@ if (*numberp >= max)
 while (isspace(*s)) s++;
 ss = s;
 while (isalnum(*s) || *s == '_') s++;
 while (isspace(*s)) s++;
 ss = s;
 while (isalnum(*s) || *s == '_') s++;

-t = store_get(sizeof(tree_node) + s-ss);
+t = store_get(sizeof(tree_node) + s-ss, is_tainted(ss));

 Ustrncpy(t->name, ss, s-ss);
 t->name[s-ss] = 0;
 while (isspace(*s)) s++;
 Ustrncpy(t->name, ss, s-ss);
 t->name[s-ss] = 0;
 while (isspace(*s)) s++;


@@ -2992,7 +3087,7 @@ Assumes:  tls_require_ciphers has been set, if it will be
 Returns:  bool for "okay"; false will cause caller to immediately exit.
 */
 
 Returns:  bool for "okay"; false will cause caller to immediately exit.
 */
 

-#ifdef SUPPORT_TLS
+#ifndef DISABLE_TLS

 static BOOL
 tls_dropprivs_validate_require_cipher(BOOL nowarn)
 {
 static BOOL
 tls_dropprivs_validate_require_cipher(BOOL nowarn)
 {


@@ -3030,7 +3125,7 @@ if (pid == 0)
     log_write(0, LOG_PANIC_DIE|LOG_CONFIG,
         "tls_require_ciphers invalid: %s", errmsg);
   fflush(NULL);
     log_write(0, LOG_PANIC_DIE|LOG_CONFIG,
         "tls_require_ciphers invalid: %s", errmsg);
   fflush(NULL);

-  _exit(0);
+  exim_underbar_exit(0);

   }
 
 do {
   }
 
 do {


@@ -3045,7 +3140,7 @@ signal(SIGCHLD, oldsignal);
 
 return status == 0;
 }
 
 return status == 0;
 }

-#endif /* SUPPORT_TLS */
+#endif /*DISABLE_TLS*/

 
 
 
 
 
 


@@ -3210,7 +3305,7 @@ if (Uchdir("/") < 0)
 /* Check the status of the file we have opened, if we have retained root
 privileges and the file isn't /dev/null (which *should* be 0666). */
 
 /* Check the status of the file we have opened, if we have retained root
 privileges and the file isn't /dev/null (which *should* be 0666). */
 

-if (trusted_config && Ustrcmp(filename, US"/dev/null"))
+if (f.trusted_config && Ustrcmp(filename, US"/dev/null"))

   {
   if (fstat(fileno(config_file), &statbuf) != 0)
     log_write(0, LOG_MAIN|LOG_PANIC_DIE, "failed to stat configuration file %s",
   {
   if (fstat(fileno(config_file), &statbuf) != 0)
     log_write(0, LOG_MAIN|LOG_PANIC_DIE, "failed to stat configuration file %s",


@@ -3233,6 +3328,19 @@ if (trusted_config && Ustrcmp(filename, US"/dev/null"))
       "wrong owner, group, or mode", big_buffer);
   }
 
       "wrong owner, group, or mode", big_buffer);
   }
 

+/* Do a dummy store-allocation of a size related to the (toplevel) file size.
+This assumes we will need this much storage to handle all the allocations
+during startup; it won't help when .include is being used.  When it does, it
+will cut down on the number of store blocks (and malloc calls, and sbrk
+syscalls).  It also assume we're on the relevant pool. */
+
+if (statbuf.st_size > 8192)
+  {
+  rmark r = store_mark();
+  store_get((int)statbuf.st_size, FALSE);
+  store_reset(r);
+  }
+

 /* Process the main configuration settings. They all begin with a lower case
 letter. If we see something starting with an upper case letter, it is taken as
 a macro definition. */
 /* Process the main configuration settings. They all begin with a lower case
 letter. If we see something starting with an upper case letter, it is taken as
 a macro definition. */


@@ -3532,7 +3640,7 @@ if (host_number_string)
   host_number = n;
   }
 
   host_number = n;
   }
 

-#ifdef SUPPORT_TLS
+#ifndef DISABLE_TLS

 /* If tls_verify_hosts is set, tls_verify_certificates must also be set */
 
 if ((tls_verify_hosts || tls_try_verify_hosts) && !tls_verify_certificates)
 /* If tls_verify_hosts is set, tls_verify_certificates must also be set */
 
 if ((tls_verify_hosts || tls_try_verify_hosts) && !tls_verify_certificates)


@@ -3565,7 +3673,7 @@ if (openssl_options)
       "openssl_options parse error: %s", openssl_options);
 # endif
   }
       "openssl_options parse error: %s", openssl_options);
 # endif
   }

-#endif /*SUPPORT_TLS*/
+#endif /*DISABLE_TLS*/

 
 if (!nowarn && !keep_environment && environ && *environ)
   log_write(0, LOG_MAIN,
 
 if (!nowarn && !keep_environment && environ && *environ)
   log_write(0, LOG_MAIN,


@@ -3598,23 +3706,18 @@ static driver_info *
 init_driver(driver_instance *d, driver_info *drivers_available,
   int size_of_info, uschar *class)
 {
 init_driver(driver_instance *d, driver_info *drivers_available,
   int size_of_info, uschar *class)
 {

-driver_info *dd;
-
-for (dd = drivers_available; dd->driver_name[0] != 0;
+for (driver_info * dd = drivers_available; dd->driver_name[0] != 0;

      dd = (driver_info *)((US dd) + size_of_info))
      dd = (driver_info *)((US dd) + size_of_info))

-  {

   if (Ustrcmp(d->driver_name, dd->driver_name) == 0)
     {
   if (Ustrcmp(d->driver_name, dd->driver_name) == 0)
     {

-    int i;

     int len = dd->options_len;
     d->info = dd;
     int len = dd->options_len;
     d->info = dd;

-    d->options_block = store_get(len);
+    d->options_block = store_get(len, FALSE);

     memcpy(d->options_block, dd->options_block, len);
     memcpy(d->options_block, dd->options_block, len);

-    for (i = 0; i < *(dd->options_count); i++)
+    for (int i = 0; i < *(dd->options_count); i++)

       dd->options[i].type &= ~opt_set;
     return dd;
     }
       dd->options[i].type &= ~opt_set;
     return dd;
     }

-  }

 
 log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN,
   "%s %s: cannot find %s driver \"%s\"", class, d->name, class, d->driver_name);
 
 log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN,
   "%s %s: cannot find %s driver \"%s\"", class, d->name, class, d->driver_name);


@@ -3701,8 +3804,6 @@ while ((buffer = get_config_line()) != NULL)
 
   if (*s++ == ':')
     {
 
   if (*s++ == ':')
     {

-    int i;
-

     /* Finish off initializing the previous driver. */
 
     if (d)
     /* Finish off initializing the previous driver. */
 
     if (d)


@@ -3723,7 +3824,7 @@ while ((buffer = get_config_line()) != NULL)
     /* Set up a new driver instance data block on the chain, with
     its default values installed. */
 
     /* Set up a new driver instance data block on the chain, with
     its default values installed. */
 

-    d = store_get(instance_size);
+    d = store_get(instance_size, FALSE);

     memcpy(d, instance_default, instance_size);
     *p = d;
     p = &d->next;
     memcpy(d, instance_default, instance_size);
     *p = d;
     p = &d->next;


@@ -3731,7 +3832,7 @@ while ((buffer = get_config_line()) != NULL)
 
     /* Clear out the "set" bits in the generic options */
 
 
     /* Clear out the "set" bits in the generic options */
 

-    for (i = 0; i < driver_optionlist_count; i++)
+    for (int i = 0; i < driver_optionlist_count; i++)

       driver_optionlist[i].type &= ~opt_set;
 
     /* Check nothing more on this line, then do the next loop iteration. */
       driver_optionlist[i].type &= ~opt_set;
 
     /* Check nothing more on this line, then do the next loop iteration. */


@@ -3804,10 +3905,9 @@ BOOL
 readconf_depends(driver_instance *d, uschar *s)
 {
 int count = *(d->info->options_count);
 readconf_depends(driver_instance *d, uschar *s)
 {
 int count = *(d->info->options_count);

-optionlist *ol;

 uschar *ss;
 
 uschar *ss;
 

-for (ol = d->info->options; ol < d->info->options + count; ol++)
+for (optionlist * ol = d->info->options; ol < d->info->options + count; ol++)

   {
   void *options_block;
   uschar *value;
   {
   void *options_block;
   uschar *value;


@@ -4023,7 +4123,7 @@ while ((p = get_config_line()))
   const uschar *pp;
   uschar *error;
 
   const uschar *pp;
   uschar *error;
 

-  next = store_get(sizeof(retry_config));
+  next = store_get(sizeof(retry_config), FALSE);

   next->next = NULL;
   *chain = next;
   chain = &(next->next);
   next->next = NULL;
   *chain = next;
   chain = &(next->next);


@@ -4067,7 +4167,7 @@ while ((p = get_config_line()))
 
   while (*p != 0)
     {
 
   while (*p != 0)
     {

-    retry_rule *rule = store_get(sizeof(retry_rule));
+    retry_rule *rule = store_get(sizeof(retry_rule), FALSE);

     *rchain = rule;
     rchain = &(rule->next);
     rule->next = NULL;
     *rchain = rule;
     rchain = &(rule->next);
     rule->next = NULL;


@@ -4125,7 +4225,9 @@ Returns:     nothing
 static void
 auths_init(void)
 {
 static void
 auths_init(void)
 {

-auth_instance *au, *bu;
+#ifdef SUPPORT_PIPE_CONNECT
+int nauths = 0;
+#endif

 
 readconf_driver_init(US"authenticator",
   (driver_instance **)(&auths),      /* chain anchor */
 
 readconf_driver_init(US"authenticator",
   (driver_instance **)(&auths),      /* chain anchor */


@@ -4136,20 +4238,26 @@ readconf_driver_init(US"authenticator",
   optionlist_auths,                  /* generic options */
   optionlist_auths_size);
 
   optionlist_auths,                  /* generic options */
   optionlist_auths_size);
 

-for (au = auths; au; au = au->next)
+for (auth_instance * au = auths; au; au = au->next)

   {
   if (!au->public_name)
     log_write(0, LOG_PANIC_DIE|LOG_CONFIG, "no public name specified for "
       "the %s authenticator", au->name);
 
   {
   if (!au->public_name)
     log_write(0, LOG_PANIC_DIE|LOG_CONFIG, "no public name specified for "
       "the %s authenticator", au->name);
 

-  for (bu = au->next; bu; bu = bu->next)
+  for (auth_instance * bu = au->next; bu; bu = bu->next)

     if (strcmpic(au->public_name, bu->public_name) == 0)
       if ((au->client && bu->client) || (au->server && bu->server))
         log_write(0, LOG_PANIC_DIE|LOG_CONFIG, "two %s authenticators "
           "(%s and %s) have the same public name (%s)",
           au->client ? US"client" : US"server", au->name, bu->name,
           au->public_name);
     if (strcmpic(au->public_name, bu->public_name) == 0)
       if ((au->client && bu->client) || (au->server && bu->server))
         log_write(0, LOG_PANIC_DIE|LOG_CONFIG, "two %s authenticators "
           "(%s and %s) have the same public name (%s)",
           au->client ? US"client" : US"server", au->name, bu->name,
           au->public_name);

+#ifdef SUPPORT_PIPE_CONNECT
+  nauths++;
+#endif

   }
   }

+#ifdef SUPPORT_PIPE_CONNECT
+f.smtp_in_early_pipe_no_auth = nauths > 16;
+#endif

 }
 
 
 }
 
 


@@ -4209,7 +4317,7 @@ while(acl_line)
   if (*p != ':' || name[0] == 0)
     log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN, "missing or malformed ACL name");
 
   if (*p != ':' || name[0] == 0)
     log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN, "missing or malformed ACL name");
 

-  node = store_get(sizeof(tree_node) + Ustrlen(name));
+  node = store_get(sizeof(tree_node) + Ustrlen(name), is_tainted(name));

   Ustrcpy(node->name, name);
   if (!tree_insertnode(&acl_anchor, node))
     log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN,
   Ustrcpy(node->name, name);
   if (!tree_insertnode(&acl_anchor, node))
     log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN,


@@ -4297,7 +4405,7 @@ while(next_section[0] != 0)
   int mid = last/2;
   int n = Ustrlen(next_section);
 
   int mid = last/2;
   int n = Ustrlen(next_section);
 

-  if (tolower(next_section[n-1]) != 's') Ustrcpy(next_section+n, "s");
+  if (tolower(next_section[n-1]) != 's') Ustrcpy(next_section+n, US"s");

 
   for (;;)
     {
 
   for (;;)
     {


@@ -4336,7 +4444,7 @@ void
 readconf_save_config(const uschar *s)
 {
 save_config_line(string_sprintf("# Exim Configuration (%s)",
 readconf_save_config(const uschar *s)
 {
 save_config_line(string_sprintf("# Exim Configuration (%s)",

-  running_in_test_harness ? US"X" : s));
+  f.running_in_test_harness ? US"X" : s));

 }
 
 static void
 }
 
 static void


@@ -4356,7 +4464,7 @@ save_config_line(const uschar* line)
 static config_line_item *current;
 config_line_item *next;
 
 static config_line_item *current;
 config_line_item *next;
 

-next = (config_line_item*) store_get(sizeof(config_line_item));
+next = (config_line_item*) store_get(sizeof(config_line_item), FALSE);

 next->line = string_copy(line);
 next->next = NULL;
 
 next->line = string_copy(line);
 next->next = NULL;
 


@@ -4371,11 +4479,10 @@ hide the <hide> values unless we're the admin user */
 void
 print_config(BOOL admin, BOOL terse)
 {
 void
 print_config(BOOL admin, BOOL terse)
 {

-config_line_item *i;

 const int TS = terse ? 0 : 2;
 int indent = 0;
 
 const int TS = terse ? 0 : 2;
 int indent = 0;
 

-for (i = config_lines; i; i = i->next)
+for (config_line_item * i = config_lines; i; i = i->next)

   {
   uschar *current;
   uschar *p;
   {
   uschar *current;
   uschar *p;