PIPE_CONNECT: promote from experimental

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

diff --git a/src/src/exim.c b/src/src/exim.c
index 198e81d892c43588841e270cb2f25c58780a841c..7571705d7092a9f8310937c26ee769d3eb705560 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -140,14 +140,13 @@ regex_match_and_setup(const pcre *re, const uschar *subject, int options, int se
 int ovector[3*(EXPAND_MAXN+1)];
 uschar * s = string_copy(subject);     /* de-constifying */
 int n = pcre_exec(re, NULL, CS s, Ustrlen(s), 0,
 int ovector[3*(EXPAND_MAXN+1)];
 uschar * s = string_copy(subject);     /* de-constifying */
 int n = pcre_exec(re, NULL, CS s, Ustrlen(s), 0,

-  PCRE_EOPT | options, ovector, sizeof(ovector)/sizeof(int));
+  PCRE_EOPT | options, ovector, nelem(ovector));

 BOOL yield = n >= 0;
 if (n == 0) n = EXPAND_MAXN + 1;
 if (yield)
   {
 BOOL yield = n >= 0;
 if (n == 0) n = EXPAND_MAXN + 1;
 if (yield)
   {

-  int nn;
-  expand_nmax = (setup < 0)? 0 : setup + 1;
-  for (nn = (setup < 0)? 0 : 2; nn < n*2; nn += 2)
+  expand_nmax = setup < 0 ? 0 : setup + 1;
+  for (int nn = setup < 0 ? 0 : 2; nn < n*2; nn += 2)

     {
     expand_nstring[expand_nmax] = s + ovector[nn];
     expand_nlength[expand_nmax++] = ovector[nn+1] - ovector[nn];
     {
     expand_nstring[expand_nmax] = s + ovector[nn];
     expand_nlength[expand_nmax++] = ovector[nn+1] - ovector[nn];


@@ -174,15 +173,22 @@ Returns:   nothing
 void
 set_process_info(const char *format, ...)
 {
 void
 set_process_info(const char *format, ...)
 {

-int len = sprintf(CS process_info, "%5d ", (int)getpid());
+gstring gs = { .size = PROCESS_INFO_SIZE - 2, .ptr = 0, .s = process_info };
+gstring * g;
+int len;

 va_list ap;
 va_list ap;

+
+g = string_fmt_append(&gs, "%5d ", (int)getpid());
+len = g->ptr;

 va_start(ap, format);
 va_start(ap, format);

-if (!string_vformat(process_info + len, PROCESS_INFO_SIZE - len - 2, format, ap))
-  Ustrcpy(process_info + len, "**** string overflowed buffer ****");
-len = Ustrlen(process_info);
-process_info[len+0] = '\n';
-process_info[len+1] = '\0';
-process_info_len = len + 1;
+if (!string_vformat(g, FALSE, format, ap))
+  {
+  gs.ptr = len;
+  g = string_cat(&gs, US"**** string overflowed buffer ****");
+  }
+g = string_catn(g, US"\n", 1);
+string_from_gstring(g);
+process_info_len = g->ptr;

 DEBUG(D_process_info) debug_printf("set_process_info: %s", process_info);
 va_end(ap);
 }
 DEBUG(D_process_info) debug_printf("set_process_info: %s", process_info);
 va_end(ap);
 }


@@ -467,8 +473,6 @@ return f;
 }
 
 
 }
 
 

-
-

 /*************************************************
 *   Ensure stdin, stdout, and stderr exist       *
 *************************************************/
 /*************************************************
 *   Ensure stdin, stdout, and stderr exist       *
 *************************************************/


@@ -490,10 +494,9 @@ Returns:    Nothing
 void
 exim_nullstd(void)
 {
 void
 exim_nullstd(void)
 {

-int i;

 int devnull = -1;
 struct stat statbuf;
 int devnull = -1;
 struct stat statbuf;

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

   {
   if (fstat(i, &statbuf) < 0 && errno == EBADF)
     {
   {
   if (fstat(i, &statbuf) < 0 && errno == EBADF)
     {


@@ -550,7 +553,7 @@ close_unwanted(void)
 {
 if (smtp_input)
   {
 {
 if (smtp_input)
   {

-#ifdef SUPPORT_TLS
+#ifndef DISABLE_TLS

   tls_close(NULL, TLS_NO_SHUTDOWN);      /* Shut down the TLS library */
 #endif
   (void)close(fileno(smtp_in));
   tls_close(NULL, TLS_NO_SHUTDOWN);      /* Shut down the TLS library */
 #endif
   (void)close(fileno(smtp_in));


@@ -628,17 +631,14 @@ if (euid == root_uid || euid != uid || egid != gid || igflag)
 DEBUG(D_uid)
   {
   int group_count, save_errno;
 DEBUG(D_uid)
   {
   int group_count, save_errno;

-  gid_t group_list[NGROUPS_MAX];
+  gid_t group_list[EXIM_GROUPLIST_SIZE];

   debug_printf("changed uid/gid: %s\n  uid=%ld gid=%ld pid=%ld\n", msg,
     (long int)geteuid(), (long int)getegid(), (long int)getpid());
   debug_printf("changed uid/gid: %s\n  uid=%ld gid=%ld pid=%ld\n", msg,
     (long int)geteuid(), (long int)getegid(), (long int)getpid());

-  group_count = getgroups(NGROUPS_MAX, group_list);
+  group_count = getgroups(nelem(group_list), group_list);

   save_errno = errno;
   debug_printf("  auxiliary group list:");
   if (group_count > 0)
   save_errno = errno;
   debug_printf("  auxiliary group list:");
   if (group_count > 0)

-    {
-    int i;
-    for (i = 0; i < group_count; i++) debug_printf(" %d", (int)group_list[i]);
-    }
+    for (int i = 0; i < group_count; i++) debug_printf(" %d", (int)group_list[i]);

   else if (group_count < 0)
     debug_printf(" <error: %s>", strerror(save_errno));
   else debug_printf(" <none>");
   else if (group_count < 0)
     debug_printf(" <error: %s>", strerror(save_errno));
   else debug_printf(" <none>");


@@ -685,6 +685,36 @@ vfprintf(stderr, fmt, ap);
 exit(EXIT_FAILURE);
 }
 
 exit(EXIT_FAILURE);
 }
 

+/* exim_chown_failure() called from exim_chown()/exim_fchown() on failure
+of chown()/fchown().  See src/functions.h for more explanation */
+int
+exim_chown_failure(int fd, const uschar *name, uid_t owner, gid_t group)
+{
+int saved_errno = errno;  /* from the preceeding chown call */
+#if 1
+log_write(0, LOG_MAIN|LOG_PANIC,
+  __FILE__ ":%d: chown(%s, %d:%d) failed (%s)."
+  " Please contact the authors and refer to https://bugs.exim.org/show_bug.cgi?id=2391",
+  __LINE__, name?name:US"<unknown>", owner, group, strerror(errno));
+#else
+/* I leave this here, commented, in case the "bug"(?) comes up again.
+   It is not an Exim bug, but we can provide a workaround.
+   See Bug 2391
+   HS 2019-04-18 */
+
+struct stat buf;
+
+if (0 == (fd < 0 ? stat(name, &buf) : fstat(fd, &buf)))
+{
+  if (buf.st_uid == owner && buf.st_gid == group) return 0;
+  log_write(0, LOG_MAIN|LOG_PANIC, "Wrong ownership on %s", name);
+}
+else log_write(0, LOG_MAIN|LOG_PANIC, "Stat failed on %s: %s", name, strerror(errno));
+
+#endif
+errno = saved_errno;
+return -1;
+}

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


@@ -800,8 +830,6 @@ Returns:    nothing
 static void
 show_whats_supported(FILE * fp)
 {
 static void
 show_whats_supported(FILE * fp)
 {

-auth_info * authi;
-

 DEBUG(D_any) {} else show_db_version(fp);
 
 fprintf(fp, "Support for:");
 DEBUG(D_any) {} else show_db_version(fp);
 
 fprintf(fp, "Support for:");


@@ -829,12 +857,11 @@ fprintf(fp, "Support for:");
 #ifdef USE_TCP_WRAPPERS
   fprintf(fp, " TCPwrappers");
 #endif
 #ifdef USE_TCP_WRAPPERS
   fprintf(fp, " TCPwrappers");
 #endif

-#ifdef SUPPORT_TLS
-# ifdef USE_GNUTLS
+#ifdef USE_GNUTLS

   fprintf(fp, " GnuTLS");
   fprintf(fp, " GnuTLS");

-# else
+#endif
+#ifdef USE_OPENSSL

   fprintf(fp, " OpenSSL");
   fprintf(fp, " OpenSSL");

-# endif

 #endif
 #ifdef SUPPORT_TRANSLATE_IP_ADDRESS
   fprintf(fp, " translate_ip_address");
 #endif
 #ifdef SUPPORT_TRANSLATE_IP_ADDRESS
   fprintf(fp, " translate_ip_address");


@@ -863,6 +890,9 @@ fprintf(fp, "Support for:");
 #ifndef DISABLE_OCSP
   fprintf(fp, " OCSP");
 #endif
 #ifndef DISABLE_OCSP
   fprintf(fp, " OCSP");
 #endif

+#ifdef SUPPORT_PIPE_CONNECT
+  fprintf(fp, " PIPE_CONNECT");
+#endif

 #ifndef DISABLE_PRDR
   fprintf(fp, " PRDR");
 #endif
 #ifndef DISABLE_PRDR
   fprintf(fp, " PRDR");
 #endif


@@ -903,8 +933,8 @@ fprintf(fp, "Support for:");
 #ifdef EXPERIMENTAL_DSN_INFO
   fprintf(fp, " Experimental_DSN_info");
 #endif
 #ifdef EXPERIMENTAL_DSN_INFO
   fprintf(fp, " Experimental_DSN_info");
 #endif

-#ifdef EXPERIMENTAL_REQUIRETLS
-  fprintf(fp, " Experimental_REQUIRETLS");
+#ifdef EXPERIMENTAL_TLS_RESUME
+  fprintf(fp, " Experimental_TLS_resume");

 #endif
 fprintf(fp, "\n");
 
 #endif
 fprintf(fp, "\n");
 


@@ -927,6 +957,9 @@ fprintf(fp, "Lookups (built-in):");
 #if defined(LOOKUP_IBASE) && LOOKUP_IBASE!=2
   fprintf(fp, " ibase");
 #endif
 #if defined(LOOKUP_IBASE) && LOOKUP_IBASE!=2
   fprintf(fp, " ibase");
 #endif

+#if defined(LOOKUP_JSON) && LOOKUP_JSON!=2
+  fprintf(fp, " json");
+#endif

 #if defined(LOOKUP_LDAP) && LOOKUP_LDAP!=2
   fprintf(fp, " ldap ldapdn ldapm");
 #endif
 #if defined(LOOKUP_LDAP) && LOOKUP_LDAP!=2
   fprintf(fp, " ldap ldapdn ldapm");
 #endif


@@ -990,8 +1023,6 @@ fprintf(fp, "Size of off_t: " SIZE_T_FMT "\n", sizeof(off_t));
 Perhaps the tls_version_report should move into this too. */
 DEBUG(D_any) do {
 
 Perhaps the tls_version_report should move into this too. */
 DEBUG(D_any) do {
 

-  int i;
-

 /* clang defines __GNUC__ (at least, for me) so test for it first */
 #if defined(__clang__)
   fprintf(fp, "Compiler: CLang [%s]\n", __clang_version__);
 /* clang defines __GNUC__ (at least, for me) so test for it first */
 #if defined(__clang__)
   fprintf(fp, "Compiler: CLang [%s]\n", __clang_version__);


@@ -1017,14 +1048,14 @@ DEBUG(D_any) do {
 
 show_db_version(fp);
 
 
 show_db_version(fp);
 

-#ifdef SUPPORT_TLS
+#ifndef DISABLE_TLS

   tls_version_report(fp);
 #endif
 #ifdef SUPPORT_I18N
   utf8_version_report(fp);
 #endif
 
   tls_version_report(fp);
 #endif
 #ifdef SUPPORT_I18N
   utf8_version_report(fp);
 #endif
 

-  for (authi = auths_available; *authi->driver_name != '\0'; ++authi)
+  for (auth_info * authi = auths_available; *authi->driver_name != '\0'; ++authi)

     if (authi->version_report)
       (*authi->version_report)(fp);
 
     if (authi->version_report)
       (*authi->version_report)(fp);
 


@@ -1045,7 +1076,7 @@ show_db_version(fp);
 #undef EXPAND_AND_QUOTE
 
   init_lookup_list();
 #undef EXPAND_AND_QUOTE
 
   init_lookup_list();

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

     if (lookup_list[i]->version_report)
       lookup_list[i]->version_report(fp);
 
     if (lookup_list[i]->version_report)
       lookup_list[i]->version_report(fp);
 


@@ -1071,8 +1102,6 @@ show_db_version(fp);
 static void
 show_exim_information(enum commandline_info request, FILE *stream)
 {
 static void
 show_exim_information(enum commandline_info request, FILE *stream)
 {

-const uschar **pp;
-

 switch(request)
   {
   case CMDINFO_NONE:
 switch(request)
   {
   case CMDINFO_NONE:


@@ -1089,7 +1118,7 @@ switch(request)
 );
     return;
   case CMDINFO_SIEVE:
 );
     return;
   case CMDINFO_SIEVE:

-    for (pp = exim_sieve_extension_list; *pp; ++pp)
+    for (const uschar ** pp = exim_sieve_extension_list; *pp; ++pp)

       fprintf(stream, "%s\n", *pp);
     return;
   case CMDINFO_DSCP:
       fprintf(stream, "%s\n", *pp);
     return;
   case CMDINFO_DSCP:


@@ -1116,9 +1145,8 @@ local_part_quote(uschar *lpart)
 {
 BOOL needs_quote = FALSE;
 gstring * g;
 {
 BOOL needs_quote = FALSE;
 gstring * g;

-uschar *t;

 
 

-for (t = lpart; !needs_quote && *t != 0; t++)
+for (uschar * t = lpart; !needs_quote && *t != 0; t++)

   {
   needs_quote = !isalnum(*t) && strchr("!#$%&'*+-/=?^_`{|}~", *t) == NULL &&
     (*t != '.' || t == lpart || t[1] == 0);
   {
   needs_quote = !isalnum(*t) && strchr("!#$%&'*+-/=?^_`{|}~", *t) == NULL &&
     (*t != '.' || t == lpart || t[1] == 0);


@@ -1215,12 +1243,11 @@ Returns:        pointer to dynamic memory, or NULL at end of file
 static uschar *
 get_stdinput(char *(*fn_readline)(const char *), void(*fn_addhist)(const char *))
 {
 static uschar *
 get_stdinput(char *(*fn_readline)(const char *), void(*fn_addhist)(const char *))
 {

-int i;

 gstring * g = NULL;
 
 if (!fn_readline) { printf("> "); fflush(stdout); }
 
 gstring * g = NULL;
 
 if (!fn_readline) { printf("> "); fflush(stdout); }
 

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

   {
   uschar buffer[1024];
   uschar *p, *ss;
   {
   uschar buffer[1024];
   uschar *p, *ss;


@@ -1320,8 +1347,7 @@ static BOOL
 macros_trusted(BOOL opt_D_used)
 {
 #ifdef WHITELIST_D_MACROS
 macros_trusted(BOOL opt_D_used)
 {
 #ifdef WHITELIST_D_MACROS

-macro_item *m;
-uschar *whitelisted, *end, *p, **whites, **w;
+uschar *whitelisted, *end, *p, **whites;

 int white_count, i, n;
 size_t len;
 BOOL prev_char_item, found;
 int white_count, i, n;
 size_t len;
 BOOL prev_char_item, found;


@@ -1386,10 +1412,10 @@ whites[i] = NULL;
 
 /* The list of commandline macros should be very short.
 Accept the N*M complexity. */
 
 /* The list of commandline macros should be very short.
 Accept the N*M complexity. */

-for (m = macros_user; m; m = m->next) if (m->command_line)
+for (macro_item * m = macros_user; m; m = m->next) if (m->command_line)

   {
   found = FALSE;
   {
   found = FALSE;

-  for (w = whites; *w; ++w)
+  for (uschar ** w = whites; *w; ++w)

     if (Ustrcmp(*w, m->name) == 0)
       {
       found = TRUE;
     if (Ustrcmp(*w, m->name) == 0)
       {
       found = TRUE;


@@ -1492,6 +1518,7 @@ int  recipients_arg = argc;
 int  sender_address_domain = 0;
 int  test_retry_arg = -1;
 int  test_rewrite_arg = -1;
 int  sender_address_domain = 0;
 int  test_retry_arg = -1;
 int  test_rewrite_arg = -1;

+gid_t original_egid;

 BOOL arg_queue_only = FALSE;
 BOOL bi_option = FALSE;
 BOOL checking = FALSE;
 BOOL arg_queue_only = FALSE;
 BOOL bi_option = FALSE;
 BOOL checking = FALSE;


@@ -1541,7 +1568,7 @@ struct passwd *pw;
 struct stat statbuf;
 pid_t passed_qr_pid = (pid_t)0;
 int passed_qr_pipe = -1;
 struct stat statbuf;
 pid_t passed_qr_pid = (pid_t)0;
 int passed_qr_pipe = -1;

-gid_t group_list[NGROUPS_MAX];
+gid_t group_list[EXIM_GROUPLIST_SIZE];

 
 /* For the -bI: flag */
 enum commandline_info info_flag = CMDINFO_NONE;
 
 /* For the -bI: flag */
 enum commandline_info info_flag = CMDINFO_NONE;


@@ -1818,6 +1845,7 @@ if ((namelen == 10 && Ustrcmp(argv[0], "newaliases") == 0) ||
 normally be root, but in some esoteric environments it may not be. */
 
 original_euid = geteuid();
 normally be root, but in some esoteric environments it may not be. */
 
 original_euid = geteuid();

+original_egid = getegid();

 
 /* Get the real uid and gid. If the caller is root, force the effective uid/gid
 to be the same as the real ones. This makes a difference only if Exim is setuid
 
 /* Get the real uid and gid. If the caller is root, force the effective uid/gid
 to be the same as the real ones. This makes a difference only if Exim is setuid


@@ -2683,9 +2711,9 @@ for (i = 1; i < argc; i++)
 
        case 'S': smtp_peer_options |= OPTION_SIZE; break;
 
 
        case 'S': smtp_peer_options |= OPTION_SIZE; break;
 

-#ifdef SUPPORT_TLS
+#ifndef DISABLE_TLS

     /* -MCt: similar to -MCT below but the connection is still open
     /* -MCt: similar to -MCT below but the connection is still open

-    via a proxy proces which handles the TLS context and coding.
+    via a proxy process which handles the TLS context and coding.

     Require three arguments for the proxied local address and port,
     and the TLS cipher.  */
 
     Require three arguments for the proxied local address and port,
     and the TLS cipher.  */
 


@@ -2709,16 +2737,6 @@ for (i = 1; i < argc; i++)
       break;
       }
 
       break;
       }
 

-#if defined(SUPPORT_TLS) && defined(EXPERIMENTAL_REQUIRETLS)
-    /* -MS   set REQUIRETLS on (new) message */
-
-    else if (*argrest == 'S')
-      {
-      tls_requiretls |= REQUIRETLS_MSG;
-      break;
-      }
-#endif
-

     /* -M[x]: various operations on the following list of message ids:
        -M    deliver the messages, ignoring next retry times and thawing
        -Mc   deliver the messages, checking next retry times, no thawing
     /* -M[x]: various operations on the following list of message ids:
        -M    deliver the messages, ignoring next retry times and thawing
        -Mc   deliver the messages, checking next retry times, no thawing


@@ -2810,8 +2828,7 @@ for (i = 1; i < argc; i++)
 
     if (!one_msg_action)
       {
 
     if (!one_msg_action)
       {

-      int j;
-      for (j = msg_action_arg; j < argc; j++) if (!mac_ismsgid(argv[j]))
+      for (int j = msg_action_arg; j < argc; j++) if (!mac_ismsgid(argv[j]))

         exim_fail("exim: malformed message id %s after %s option\n",
           argv[j], arg);
       goto END_ARG;   /* Remaining args are ids */
         exim_fail("exim: malformed message id %s after %s option\n",
           argv[j], arg);
       goto END_ARG;   /* Remaining args are ids */


@@ -3175,22 +3192,23 @@ for (i = 1; i < argc; i++)
     /* -q[f][f][l][G<name>]: Run the queue, optionally forced, optionally local
     only, optionally named, optionally starting from a given message id. */
 
     /* -q[f][f][l][G<name>]: Run the queue, optionally forced, optionally local
     only, optionally named, optionally starting from a given message id. */
 

-    if (*argrest == 0 &&
-        (i + 1 >= argc || argv[i+1][0] == '-' || mac_ismsgid(argv[i+1])))
-      {
-      queue_interval = 0;
-      if (i+1 < argc && mac_ismsgid(argv[i+1]))
-        start_queue_run_id = argv[++i];
-      if (i+1 < argc && mac_ismsgid(argv[i+1]))
-        stop_queue_run_id = argv[++i];
-      }
+    if (!(list_queue || count_queue))
+      if (*argrest == 0
+        && (i + 1 >= argc || argv[i+1][0] == '-' || mac_ismsgid(argv[i+1])))
+       {
+       queue_interval = 0;
+       if (i+1 < argc && mac_ismsgid(argv[i+1]))
+         start_queue_run_id = argv[++i];
+       if (i+1 < argc && mac_ismsgid(argv[i+1]))
+         stop_queue_run_id = argv[++i];
+       }

 
     /* -q[f][f][l][G<name>/]<n>: Run the queue at regular intervals, optionally
     forced, optionally local only, optionally named. */
 
 
     /* -q[f][f][l][G<name>/]<n>: Run the queue at regular intervals, optionally
     forced, optionally local only, optionally named. */
 

-    else if ((queue_interval = readconf_readtime(*argrest ? argrest : argv[++i],
-                                               0, FALSE)) <= 0)
-      exim_fail("exim: bad time value %s: abandoned\n", argv[i]);
+      else if ((queue_interval = readconf_readtime(*argrest ? argrest : argv[++i],
+                                                 0, FALSE)) <= 0)
+       exim_fail("exim: bad time value %s: abandoned\n", argv[i]);

     break;
 
 
     break;
 
 


@@ -3207,9 +3225,7 @@ for (i = 1; i < argc; i++)
     argument. */
 
     if (*argrest != 0)
     argument. */
 
     if (*argrest != 0)

-      {
-      int i;
-      for (i = 0; i < nelem(rsopts); i++)
+      for (int i = 0; i < nelem(rsopts); i++)

         if (Ustrcmp(argrest, rsopts[i]) == 0)
           {
           if (i != 2) f.queue_run_force = TRUE;
         if (Ustrcmp(argrest, rsopts[i]) == 0)
           {
           if (i != 2) f.queue_run_force = TRUE;


@@ -3217,7 +3233,6 @@ for (i = 1; i < argc; i++)
           if (i == 1 || i == 4) f.deliver_force_thaw = TRUE;
           argrest += Ustrlen(rsopts[i]);
           }
           if (i == 1 || i == 4) f.deliver_force_thaw = TRUE;
           argrest += Ustrlen(rsopts[i]);
           }

-      }

 
     /* -R: Set string to match in addresses for forced queue run to
     pick out particular messages. */
 
     /* -R: Set string to match in addresses for forced queue run to
     pick out particular messages. */


@@ -3249,9 +3264,7 @@ for (i = 1; i < argc; i++)
     argument. */
 
     if (*argrest)
     argument. */
 
     if (*argrest)

-      {
-      int i;
-      for (i = 0; i < nelem(rsopts); i++)
+      for (int i = 0; i < nelem(rsopts); i++)

         if (Ustrcmp(argrest, rsopts[i]) == 0)
           {
           if (i != 2) f.queue_run_force = TRUE;
         if (Ustrcmp(argrest, rsopts[i]) == 0)
           {
           if (i != 2) f.queue_run_force = TRUE;


@@ -3259,7 +3272,6 @@ for (i = 1; i < argc; i++)
           if (i == 1 || i == 4) f.deliver_force_thaw = TRUE;
           argrest += Ustrlen(rsopts[i]);
           }
           if (i == 1 || i == 4) f.deliver_force_thaw = TRUE;
           argrest += Ustrlen(rsopts[i]);
           }

-      }

 
     /* -S: Set string to match in addresses for forced queue run to
     pick out particular messages. */
 
     /* -S: Set string to match in addresses for forced queue run to
     pick out particular messages. */


@@ -3300,7 +3312,7 @@ for (i = 1; i < argc; i++)
 
     /* -tls-on-connect: don't wait for STARTTLS (for old clients) */
 
 
     /* -tls-on-connect: don't wait for STARTTLS (for old clients) */
 

-    #ifdef SUPPORT_TLS
+    #ifndef DISABLE_TLS

     else if (Ustrcmp(argrest, "ls-on-connect") == 0) tls_in.on_connect = TRUE;
     #endif
 
     else if (Ustrcmp(argrest, "ls-on-connect") == 0) tls_in.on_connect = TRUE;
     #endif
 


@@ -3532,7 +3544,7 @@ check on the additional groups for the admin user privilege - can't do that
 till after reading the config, which might specify the exim gid. Therefore,
 save the group list here first. */
 
 till after reading the config, which might specify the exim gid. Therefore,
 save the group list here first. */
 

-if ((group_count = getgroups(NGROUPS_MAX, group_list)) < 0)
+if ((group_count = getgroups(nelem(group_list), group_list)) < 0)

   exim_fail("exim: getgroups() failed: %s\n", strerror(errno));
 
 /* There is a fundamental difference in some BSD systems in the matter of
   exim_fail("exim: getgroups() failed: %s\n", strerror(errno));
 
 /* There is a fundamental difference in some BSD systems in the matter of


@@ -3546,6 +3558,11 @@ over a single group - the current group, which is always the first group in the
 list. Calling setgroups() with zero groups on a "different" system results in
 an error return. The following code should cope with both types of system.
 
 list. Calling setgroups() with zero groups on a "different" system results in
 an error return. The following code should cope with both types of system.
 

+ Unfortunately, recent MacOS, which should be a FreeBSD, "helpfully" succeeds
+ the "setgroups() with zero groups" - and changes the egid.
+ Thanks to that we had to stash the original_egid above, for use below
+ in the call to exim_setugid().
+

 However, if this process isn't running as root, setgroups() can't be used
 since you have to be root to run it, even if throwing away groups. Not being
 root here happens only in some unusual configurations. We just ignore the
 However, if this process isn't running as root, setgroups() can't be used
 since you have to be root to run it, even if throwing away groups. Not being
 root here happens only in some unusual configurations. We just ignore the


@@ -3605,7 +3622,7 @@ the real uid to the effective so that subsequent re-execs of Exim are done by a
 privileged user. */
 
 else
 privileged user. */
 
 else

-  exim_setugid(geteuid(), getegid(), FALSE, US"forcing real = effective");
+  exim_setugid(geteuid(), original_egid, FALSE, US"forcing real = effective");

 
 /* If testing a filter, open the file(s) now, before wasting time doing other
 setups and reading the message. */
 
 /* If testing a filter, open the file(s) now, before wasting time doing other
 setups and reading the message. */


@@ -3639,7 +3656,7 @@ if (f.running_in_test_harness) smtputf8_advertise_hosts = NULL;
 is a failure. It leaves the configuration file open so that the subsequent
 configuration data for delivery can be read if needed.
 
 is a failure. It leaves the configuration file open so that the subsequent
 configuration data for delivery can be read if needed.
 

-NOTE: immediatly after opening the configuration file we change the working
+NOTE: immediately after opening the configuration file we change the working

 directory to "/"! Later we change to $spool_directory. We do it there, because
 during readconf_main() some expansion takes place already. */
 
 directory to "/"! Later we change to $spool_directory. We do it there, because
 during readconf_main() some expansion takes place already. */
 


@@ -3683,16 +3700,13 @@ for later interrogation. */
 if (real_uid == root_uid || real_uid == exim_uid || real_gid == exim_gid)
   f.admin_user = TRUE;
 else
 if (real_uid == root_uid || real_uid == exim_uid || real_gid == exim_gid)
   f.admin_user = TRUE;
 else

-  {
-  int i, j;
-  for (i = 0; i < group_count && !f.admin_user; i++)
+  for (int i = 0; i < group_count && !f.admin_user; i++)

     if (group_list[i] == exim_gid)
       f.admin_user = TRUE;
     else if (admin_groups)
     if (group_list[i] == exim_gid)
       f.admin_user = TRUE;
     else if (admin_groups)

-      for (j = 1; j <= (int)admin_groups[0] && !f.admin_user; j++)
+      for (int j = 1; j <= (int)admin_groups[0] && !f.admin_user; j++)

         if (admin_groups[j] == group_list[i])
           f.admin_user = TRUE;
         if (admin_groups[j] == group_list[i])
           f.admin_user = TRUE;

-  }

 
 /* Another group of privileged users are the trusted users. These are root,
 exim, and any caller matching trusted_users or trusted_groups. Trusted callers
 
 /* Another group of privileged users are the trusted users. These are root,
 exim, and any caller matching trusted_users or trusted_groups. Trusted callers


@@ -3703,18 +3717,16 @@ if (real_uid == root_uid || real_uid == exim_uid)
   f.trusted_caller = TRUE;
 else
   {
   f.trusted_caller = TRUE;
 else
   {

-  int i, j;
-

   if (trusted_users)
   if (trusted_users)

-    for (i = 1; i <= (int)trusted_users[0] && !f.trusted_caller; i++)
+    for (int i = 1; i <= (int)trusted_users[0] && !f.trusted_caller; i++)

       if (trusted_users[i] == real_uid)
         f.trusted_caller = TRUE;
 
   if (trusted_groups)
       if (trusted_users[i] == real_uid)
         f.trusted_caller = TRUE;
 
   if (trusted_groups)

-    for (i = 1; i <= (int)trusted_groups[0] && !f.trusted_caller; i++)
+    for (int i = 1; i <= (int)trusted_groups[0] && !f.trusted_caller; i++)

       if (trusted_groups[i] == real_gid)
         f.trusted_caller = TRUE;
       if (trusted_groups[i] == real_gid)
         f.trusted_caller = TRUE;

-      else for (j = 0; j < group_count && !f.trusted_caller; j++)
+      else for (int j = 0; j < group_count && !f.trusted_caller; j++)

         if (trusted_groups[i] == group_list[j])
           f.trusted_caller = TRUE;
   }
         if (trusted_groups[i] == group_list[j])
           f.trusted_caller = TRUE;
   }


@@ -3732,10 +3744,9 @@ decode_bits(log_selector, log_selector_size, log_notall,
 
 DEBUG(D_any)
   {
 
 DEBUG(D_any)
   {

-  int i;

   debug_printf("configuration file is %s\n", config_main_filename);
   debug_printf("log selectors =");
   debug_printf("configuration file is %s\n", config_main_filename);
   debug_printf("log selectors =");

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

     debug_printf(" %08x", log_selector[i]);
   debug_printf("\n");
   }
     debug_printf(" %08x", log_selector[i]);
   debug_printf("\n");
   }


@@ -3812,9 +3823,7 @@ EXIM_TMPDIR by the build scripts.
 */
 
 #ifdef EXIM_TMPDIR
 */
 
 #ifdef EXIM_TMPDIR

-  {
-  uschar **p;
-  if (environ) for (p = USS environ; *p; p++)
+  if (environ) for (uschar ** p = USS environ; *p; p++)

     if (Ustrncmp(*p, "TMPDIR=", 7) == 0 && Ustrcmp(*p+7, EXIM_TMPDIR) != 0)
       {
       uschar * newp = store_malloc(Ustrlen(EXIM_TMPDIR) + 8);
     if (Ustrncmp(*p, "TMPDIR=", 7) == 0 && Ustrcmp(*p+7, EXIM_TMPDIR) != 0)
       {
       uschar * newp = store_malloc(Ustrlen(EXIM_TMPDIR) + 8);


@@ -3822,7 +3831,6 @@ EXIM_TMPDIR by the build scripts.
       *p = newp;
       DEBUG(D_any) debug_printf("reset TMPDIR=%s in environment\n", EXIM_TMPDIR);
       }
       *p = newp;
       DEBUG(D_any) debug_printf("reset TMPDIR=%s in environment\n", EXIM_TMPDIR);
       }

-  }

 #endif
 
 /* Timezone handling. If timezone_string is "utc", set a flag to cause all
 #endif
 
 /* Timezone handling. If timezone_string is "utc", set a flag to cause all


@@ -3924,7 +3932,6 @@ verifying/testing addresses or expansions. */
 if (  (debug_selector & D_any  ||  LOGGING(arguments))
    && f.really_exim && !list_options && !checking)
   {
 if (  (debug_selector & D_any  ||  LOGGING(arguments))
    && f.really_exim && !list_options && !checking)
   {

-  int i;

   uschar *p = big_buffer;
   Ustrcpy(p, "cwd= (failed)");
 
   uschar *p = big_buffer;
   Ustrcpy(p, "cwd= (failed)");
 


@@ -3941,7 +3948,7 @@ if (  (debug_selector & D_any  ||  LOGGING(arguments))
 
   (void)string_format(p, big_buffer_size - (p - big_buffer), " %d args:", argc);
   while (*p) p++;
 
   (void)string_format(p, big_buffer_size - (p - big_buffer), " %d args:", argc);
   while (*p) p++;

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

     {
     int len = Ustrlen(argv[i]);
     const uschar *printing;
     {
     int len = Ustrlen(argv[i]);
     const uschar *printing;


@@ -4188,6 +4195,7 @@ if (!unprivileged &&                      /* originally had root AND */
 else
   {
   int rv;
 else
   {
   int rv;

+  DEBUG(D_any) debug_printf("dropping to exim gid; retaining priv uid\n");

   rv = setgid(exim_gid);
   /* Impact of failure is that some stuff might end up with an incorrect group.
   We track this for failures from root, since any attempt to change privilege
   rv = setgid(exim_gid);
   /* Impact of failure is that some stuff might end up with an incorrect group.
   We track this for failures from root, since any attempt to change privilege


@@ -4359,7 +4367,6 @@ if (test_retry_arg >= 0)
     printf("No retry information found\n");
   else
     {
     printf("No retry information found\n");
   else
     {

-    retry_rule *r;

     more_errno = yield->more_errno;
     printf("Retry rule: %s  ", yield->pattern);
 
     more_errno = yield->more_errno;
     printf("Retry rule: %s  ", yield->pattern);
 


@@ -4389,7 +4396,7 @@ if (test_retry_arg >= 0)
       printf("auth_failed  ");
     else printf("*  ");
 
       printf("auth_failed  ");
     else printf("*  ");
 

-    for (r = yield->rules; r; r = r->next)
+    for (retry_rule * r = yield->rules; r; r = r->next)

       {
       printf("%c,%s", r->rule, readconf_printtime(r->timeout)); /* Do not */
       printf(",%s", readconf_printtime(r->p1));                 /* amalgamate */
       {
       printf("%c,%s", r->rule, readconf_printtime(r->timeout)); /* Do not */
       printf(",%s", readconf_printtime(r->p1));                 /* amalgamate */


@@ -5265,7 +5272,6 @@ while (more)
 
   else
     {
 
   else
     {

-    int i;

     int rcount = 0;
     int count = argc - recipients_arg;
     uschar **list = argv + recipients_arg;
     int rcount = 0;
     int count = argc - recipients_arg;
     uschar **list = argv + recipients_arg;


@@ -5281,7 +5287,7 @@ while (more)
 
     /* Loop for each argument */
 
 
     /* Loop for each argument */
 

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

       {
       int start, end, domain;
       uschar *errmess;
       {
       int start, end, domain;
       uschar *errmess;


@@ -5363,12 +5369,11 @@ while (more)
 
     DEBUG(D_receive)
       {
 
     DEBUG(D_receive)
       {

-      int i;

       if (sender_address != NULL) debug_printf("Sender: %s\n", sender_address);
       if (recipients_list != NULL)
         {
         debug_printf("Recipients:\n");
       if (sender_address != NULL) debug_printf("Sender: %s\n", sender_address);
       if (recipients_list != NULL)
         {
         debug_printf("Recipients:\n");

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

           debug_printf("  %s\n", recipients_list[i].address);
         }
       }
           debug_printf("  %s\n", recipients_list[i].address);
         }
       }


@@ -5627,7 +5632,7 @@ moreloop:
   callout_address = NULL;
   sending_ip_address = NULL;
   acl_var_m = NULL;
   callout_address = NULL;
   sending_ip_address = NULL;
   acl_var_m = NULL;

-  { int i; for(i=0; i<REGEX_VARS; i++) regex_vars[i] = NULL; }
+  for(int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL;

 
   store_reset(reset_point);
   }
 
   store_reset(reset_point);
   }