Memory management: drop $acl_m_ variables explicitly as they go out-of-scope

[users/jgh/exim.git] / src / src / daemon.c

diff --git a/src/src/daemon.c b/src/src/daemon.c
index 256cc9cb7357d4e1f661de46a4ad99be405b123d..ea0c2226259f062a5778c9441275fcde70aea82e 100644 (file)
--- a/src/src/daemon.c
+++ b/src/src/daemon.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

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

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions concerned with running Exim as a daemon */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions concerned with running Exim as a daemon */


@@ -19,7 +19,7 @@ typedef struct smtp_slot {
 } smtp_slot;
 
 /* An empty slot for initializing (Standard C does not allow constructor
 } smtp_slot;
 
 /* An empty slot for initializing (Standard C does not allow constructor

-expressions in assigments except as initializers in declarations). */
+expressions in assignments except as initializers in declarations). */

 
 static smtp_slot empty_smtp_slot = { 0, NULL };
 
 
 static smtp_slot empty_smtp_slot = { 0, NULL };
 


@@ -145,7 +145,7 @@ int dup_accept_socket = -1;
 int max_for_this_host = 0;
 int wfsize = 0;
 int wfptr = 0;
 int max_for_this_host = 0;
 int wfsize = 0;
 int wfptr = 0;

-int use_log_write_selector = log_write_selector;
+int save_log_selector = *log_selector;

 uschar *whofrom = NULL;
 
 void *reset_point = store_get(0);
 uschar *whofrom = NULL;
 
 void *reset_point = store_get(0);


@@ -161,23 +161,20 @@ DEBUG(D_any) debug_printf("Connection request from %s port %d\n",
 input stream. These operations fail only the exceptional circumstances. Note
 that never_error() won't use smtp_out if it is NULL. */
 
 input stream. These operations fail only the exceptional circumstances. Note
 that never_error() won't use smtp_out if it is NULL. */
 

-smtp_out = fdopen(accept_socket, "wb");
-if (smtp_out == NULL)
+if (!(smtp_out = fdopen(accept_socket, "wb")))

   {
   never_error(US"daemon: fdopen() for smtp_out failed", US"", errno);
   goto ERROR_RETURN;
   }
 
   {
   never_error(US"daemon: fdopen() for smtp_out failed", US"", errno);
   goto ERROR_RETURN;
   }
 

-dup_accept_socket = dup(accept_socket);
-if (dup_accept_socket < 0)
+if ((dup_accept_socket = dup(accept_socket)) < 0)

   {
   never_error(US"daemon: couldn't dup socket descriptor",
     US"Connection setup failed", errno);
   goto ERROR_RETURN;
   }
 
   {
   never_error(US"daemon: couldn't dup socket descriptor",
     US"Connection setup failed", errno);
   goto ERROR_RETURN;
   }
 

-smtp_in = fdopen(dup_accept_socket, "rb");
-if (smtp_in == NULL)
+if (!(smtp_in = fdopen(dup_accept_socket, "rb")))

   {
   never_error(US"daemon: fdopen() for smtp_in failed",
     US"Connection setup failed", errno);
   {
   never_error(US"daemon: fdopen() for smtp_in failed",
     US"Connection setup failed", errno);


@@ -206,11 +203,11 @@ memory is reclaimed. */
 
 whofrom = string_append(whofrom, &wfsize, &wfptr, 3, "[", sender_host_address, "]");
 
 
 whofrom = string_append(whofrom, &wfsize, &wfptr, 3, "[", sender_host_address, "]");
 

-if ((log_extra_selector & LX_incoming_port) != 0)
+if (LOGGING(incoming_port))

   whofrom = string_append(whofrom, &wfsize, &wfptr, 2, ":", string_sprintf("%d",
     sender_host_port));
 
   whofrom = string_append(whofrom, &wfsize, &wfptr, 2, ":", string_sprintf("%d",
     sender_host_port));
 

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

   whofrom = string_append(whofrom, &wfsize, &wfptr, 4, " I=[",
     interface_address, "]:", string_sprintf("%d", interface_port));
 
   whofrom = string_append(whofrom, &wfsize, &wfptr, 4, " I=[",
     interface_address, "]:", string_sprintf("%d", interface_port));
 


@@ -293,8 +290,7 @@ if ((max_for_this_host > 0) &&
   int other_host_count = 0;    /* keep a count of non matches to optimise */
 
   for (i = 0; i < smtp_accept_max; ++i)
   int other_host_count = 0;    /* keep a count of non matches to optimise */
 
   for (i = 0; i < smtp_accept_max; ++i)

-    {
-    if (smtp_slots[i].host_address != NULL)
+    if (smtp_slots[i].host_address)

       {
       if (Ustrcmp(sender_host_address, smtp_slots[i].host_address) == 0)
        host_accept_count++;
       {
       if (Ustrcmp(sender_host_address, smtp_slots[i].host_address) == 0)
        host_accept_count++;


@@ -309,7 +305,6 @@ if ((max_for_this_host > 0) &&
          ((smtp_accept_count - other_host_count) < max_for_this_host))
        break;
       }
          ((smtp_accept_count - other_host_count) < max_for_this_host))
        break;
       }

-    }

 
   if (host_accept_count >= max_for_this_host)
     {
 
   if (host_accept_count >= max_for_this_host)
     {


@@ -338,11 +333,12 @@ the generalized logging code each time when the selector is false. If the
 selector is set, check whether the host is on the list for logging. If not,
 arrange to unset the selector in the subprocess. */
 
 selector is set, check whether the host is on the list for logging. If not,
 arrange to unset the selector in the subprocess. */
 

-if ((log_write_selector & L_smtp_connection) != 0)
+if (LOGGING(smtp_connection))

   {
   uschar *list = hosts_connection_nolog;
   {
   uschar *list = hosts_connection_nolog;

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

   if (list != NULL && verify_check_host(&list) == OK)
   if (list != NULL && verify_check_host(&list) == OK)

-    use_log_write_selector &= ~L_smtp_connection;
+    save_log_selector &= ~L_smtp_connection;

   else
     log_write(L_smtp_connection, LOG_MAIN, "SMTP connection from %s "
       "(TCP/IP connection count = %d)", whofrom, smtp_accept_count + 1);
   else
     log_write(L_smtp_connection, LOG_MAIN, "SMTP connection from %s "
       "(TCP/IP connection count = %d)", whofrom, smtp_accept_count + 1);


@@ -372,7 +368,7 @@ if (pid == 0)
 
   /* May have been modified for the subprocess */
 
 
   /* May have been modified for the subprocess */
 

-  log_write_selector = use_log_write_selector;
+  *log_selector = save_log_selector;

 
   /* Get the local interface address into permanent store */
 
 
   /* Get the local interface address into permanent store */
 


@@ -389,10 +385,10 @@ if (pid == 0)
   likely what it depends on.) */
 
   smtp_active_hostname = primary_hostname;
   likely what it depends on.) */
 
   smtp_active_hostname = primary_hostname;

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

     {
     {

-    uschar *nah = expand_string(raw_active_hostname);
-    if (nah == NULL)
+    uschar * nah = expand_string(raw_active_hostname);
+    if (!nah)

       {
       if (!expand_string_forcedfail)
         {
       {
       if (!expand_string_forcedfail)
         {


@@ -406,7 +402,7 @@ if (pid == 0)
         _exit(EXIT_FAILURE);
         }
       }
         _exit(EXIT_FAILURE);
         }
       }

-    else if (nah[0] != 0) smtp_active_hostname = nah;
+    else if (*nah) smtp_active_hostname = nah;

     }
 
   /* Initialize the queueing flags */
     }
 
   /* Initialize the queueing flags */


@@ -522,10 +518,23 @@ if (pid == 0)
       }
     else
       {
       }
     else
       {

-      mac_smtp_fflush();
+      if (smtp_out)
+       {
+       int i, fd = fileno(smtp_in);
+       uschar buf[128];
+
+       mac_smtp_fflush();
+       /* drain socket, for clean TCP FINs */
+       if (fcntl(fd, F_SETFL, O_NONBLOCK) == 0)
+         for(i = 16; read(fd, buf, sizeof(buf)) > 0 && i > 0; ) i--;
+       }

       search_tidyup();
       smtp_log_no_mail();                 /* Log no mail if configured */
       search_tidyup();
       smtp_log_no_mail();                 /* Log no mail if configured */

-      _exit((rc == 0)? EXIT_SUCCESS : EXIT_FAILURE);
+
+      /*XXX should we pause briefly, hoping that the client will be the
+      active TCP closer hence get the TCP_WAIT endpoint? */
+      DEBUG(D_receive) debug_printf("SMTP>>(close on process exit)\n");
+      _exit(rc ? EXIT_FAILURE : EXIT_SUCCESS);

       }
 
     /* Show the recipients when debugging */
       }
 
     /* Show the recipients when debugging */


@@ -555,6 +564,16 @@ if (pid == 0)
 
     /* Reclaim up the store used in accepting this message */
 
 
     /* Reclaim up the store used in accepting this message */
 

+    return_path = sender_address = NULL;
+    authenticated_sender = NULL;
+    sending_ip_address = NULL;
+    deliver_host_address = deliver_host =
+    deliver_domain_orig = deliver_localpart_orig = NULL;
+    dnslist_domain = dnslist_matched = NULL;
+#ifndef DISABLE_DKIM
+    dkim_cur_signer = NULL;
+#endif
+    acl_var_m = NULL;

     store_reset(reset_point);
 
     /* If queue_only is set or if there are too many incoming connections in
     store_reset(reset_point);
 
     /* If queue_only is set or if there are too many incoming connections in


@@ -581,15 +600,13 @@ if (pid == 0)
     very long-lived connections from scanning appliances where this is not the
     best strategy. In such cases, queue_only_load_latch should be set false. */
 
     very long-lived connections from scanning appliances where this is not the
     best strategy. In such cases, queue_only_load_latch should be set false. */
 

-    local_queue_only = session_local_queue_only;
-    if (!local_queue_only && queue_only_load >= 0)
+    if (  !(local_queue_only = session_local_queue_only)
+       && queue_only_load >= 0
+       && (local_queue_only = (load_average = OS_GETLOADAVG()) > queue_only_load)
+       )

       {
       {

-      local_queue_only = (load_average = OS_GETLOADAVG()) > queue_only_load;
-      if (local_queue_only)
-        {
-        queue_only_reason = 3;
-        if (queue_only_load_latch) session_local_queue_only = TRUE;
-        }
+      queue_only_reason = 3;
+      if (queue_only_load_latch) session_local_queue_only = TRUE;

       }
 
     /* Log the queueing here, when it will get a message id attached, but
       }
 
     /* Log the queueing here, when it will get a message id attached, but


@@ -597,23 +614,20 @@ if (pid == 0)
 
     if (local_queue_only) switch(queue_only_reason)
       {
 
     if (local_queue_only) switch(queue_only_reason)
       {

-      case 1:
-      log_write(L_delay_delivery,
+      case 1: log_write(L_delay_delivery,

                 LOG_MAIN, "no immediate delivery: too many connections "
                 "(%d, max %d)", smtp_accept_count, smtp_accept_queue);
                 LOG_MAIN, "no immediate delivery: too many connections "
                 "(%d, max %d)", smtp_accept_count, smtp_accept_queue);

-      break;
+             break;

 
 

-      case 2:
-      log_write(L_delay_delivery,
+      case 2: log_write(L_delay_delivery,

                 LOG_MAIN, "no immediate delivery: more than %d messages "
                 "received in one connection", smtp_accept_queue_per_connection);
                 LOG_MAIN, "no immediate delivery: more than %d messages "
                 "received in one connection", smtp_accept_queue_per_connection);

-      break;
+             break;

 
 

-      case 3:
-      log_write(L_delay_delivery,
+      case 3: log_write(L_delay_delivery,

                 LOG_MAIN, "no immediate delivery: load average %.2f",
                 (double)load_average/1000.0);
                 LOG_MAIN, "no immediate delivery: load average %.2f",
                 (double)load_average/1000.0);

-      break;
+             break;

       }
 
     /* If a delivery attempt is required, spin off a new process to handle it.
       }
 
     /* If a delivery attempt is required, spin off a new process to handle it.


@@ -650,8 +664,8 @@ if (pid == 0)
         if (geteuid() != root_uid && !deliver_drop_privilege)
           {
           signal(SIGALRM, SIG_DFL);
         if (geteuid() != root_uid && !deliver_drop_privilege)
           {
           signal(SIGALRM, SIG_DFL);

-          (void)child_exec_exim(CEE_EXEC_PANIC, FALSE, NULL, FALSE, 2, US"-Mc",
-            message_id);
+          (void)child_exec_exim(CEE_EXEC_PANIC, FALSE, NULL, FALSE,
+           2, US"-Mc", message_id);

           /* Control does not return here. */
           }
 
           /* Control does not return here. */
           }
 


@@ -667,10 +681,8 @@ if (pid == 0)
         DEBUG(D_any) debug_printf("forked delivery process %d\n", (int)dpid);
         }
       else
         DEBUG(D_any) debug_printf("forked delivery process %d\n", (int)dpid);
         }
       else

-        {

         log_write(0, LOG_MAIN|LOG_PANIC, "daemon: delivery process fork "
           "failed: %s", strerror(errno));
         log_write(0, LOG_MAIN|LOG_PANIC, "daemon: delivery process fork "
           "failed: %s", strerror(errno));

-        }

       }
     }
   }
       }
     }
   }


@@ -681,14 +693,11 @@ failed. Otherwise, keep count of the number of accepting processes and
 remember the pid for ticking off when the child completes. */
 
 if (pid < 0)
 remember the pid for ticking off when the child completes. */
 
 if (pid < 0)

-  {

   never_error(US"daemon: accept process fork failed", US"Fork failed", errno);
   never_error(US"daemon: accept process fork failed", US"Fork failed", errno);

-  }

 else
   {
   int i;
   for (i = 0; i < smtp_accept_max; ++i)
 else
   {
   int i;
   for (i = 0; i < smtp_accept_max; ++i)

-    {

     if (smtp_slots[i].pid <= 0)
       {
       smtp_slots[i].pid = pid;
     if (smtp_slots[i].pid <= 0)
       {
       smtp_slots[i].pid = pid;


@@ -697,7 +706,6 @@ else
       smtp_accept_count++;
       break;
       }
       smtp_accept_count++;
       break;
       }

-    }

   DEBUG(D_any) debug_printf("%d SMTP accept process%s running\n",
     smtp_accept_count, (smtp_accept_count == 1)? "" : "es");
   }
   DEBUG(D_any) debug_printf("%d SMTP accept process%s running\n",
     smtp_accept_count, (smtp_accept_count == 1)? "" : "es");
   }


@@ -714,7 +722,7 @@ manifest itself as a broken pipe, so drop that one too. If the streams don't
 exist, something went wrong while setting things up. Make sure the socket
 descriptors are closed, in order to drop the connection. */
 
 exist, something went wrong while setting things up. Make sure the socket
 descriptors are closed, in order to drop the connection. */
 

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

   {
   if (fclose(smtp_out) != 0 && errno != ECONNRESET && errno != EPIPE)
     log_write(0, LOG_MAIN|LOG_PANIC, "daemon: fclose(smtp_out) failed: %s",
   {
   if (fclose(smtp_out) != 0 && errno != ECONNRESET && errno != EPIPE)
     log_write(0, LOG_MAIN|LOG_PANIC, "daemon: fclose(smtp_out) failed: %s",


@@ -723,7 +731,7 @@ if (smtp_out != NULL)
   }
 else (void)close(accept_socket);
 
   }
 else (void)close(accept_socket);
 

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

   {
   if (fclose(smtp_in) != 0 && errno != ECONNRESET && errno != EPIPE)
     log_write(0, LOG_MAIN|LOG_PANIC, "daemon: fclose(smtp_in) failed: %s",
   {
   if (fclose(smtp_in) != 0 && errno != ECONNRESET && errno != EPIPE)
     log_write(0, LOG_MAIN|LOG_PANIC, "daemon: fclose(smtp_in) failed: %s",


@@ -735,6 +743,9 @@ else (void)close(dup_accept_socket);
 /* Release any store used in this process, including the store used for holding
 the incoming host address and an expanded active_hostname. */
 
 /* Release any store used in this process, including the store used for holding
 the incoming host address and an expanded active_hostname. */
 

+log_close_all();
+interface_address =
+sender_host_address = NULL;

 store_reset(reset_point);
 sender_host_address = NULL;
 }
 store_reset(reset_point);
 sender_host_address = NULL;
 }


@@ -843,13 +854,12 @@ while ((pid = waitpid(-1, &status, WNOHANG)) > 0)
   /* If it's a listening daemon for which we are keeping track of individual
   subprocesses, deal with an accepting process that has terminated. */
 
   /* If it's a listening daemon for which we are keeping track of individual
   subprocesses, deal with an accepting process that has terminated. */
 

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

     {
     for (i = 0; i < smtp_accept_max; i++)
     {
     for (i = 0; i < smtp_accept_max; i++)

-      {

       if (smtp_slots[i].pid == pid)
         {
       if (smtp_slots[i].pid == pid)
         {

-        if (smtp_slots[i].host_address != NULL)
+        if (smtp_slots[i].host_address)

           store_free(smtp_slots[i].host_address);
         smtp_slots[i] = empty_smtp_slot;
         if (--smtp_accept_count < 0) smtp_accept_count = 0;
           store_free(smtp_slots[i].host_address);
         smtp_slots[i] = empty_smtp_slot;
         if (--smtp_accept_count < 0) smtp_accept_count = 0;


@@ -857,17 +867,16 @@ while ((pid = waitpid(-1, &status, WNOHANG)) > 0)
           smtp_accept_count, (smtp_accept_count == 1)? "" : "es");
         break;
         }
           smtp_accept_count, (smtp_accept_count == 1)? "" : "es");
         break;
         }

-      }

     if (i < smtp_accept_max) continue;  /* Found an accepting process */
     }
 
   /* If it wasn't an accepting process, see if it was a queue-runner
   process that we are tracking. */
 
     if (i < smtp_accept_max) continue;  /* Found an accepting process */
     }
 
   /* If it wasn't an accepting process, see if it was a queue-runner
   process that we are tracking. */
 

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

     {
     {

-    for (i = 0; i < queue_run_max; i++)
-      {
+    int max = atoi(CS expand_string(queue_run_max));
+    for (i = 0; i < max; i++)

       if (queue_pid_slots[i] == pid)
         {
         queue_pid_slots[i] = 0;
       if (queue_pid_slots[i] == pid)
         {
         queue_pid_slots[i] = 0;


@@ -876,7 +885,6 @@ while ((pid = waitpid(-1, &status, WNOHANG)) > 0)
           queue_run_count, (queue_run_count == 1)? "" : "es");
         break;
         }
           queue_run_count, (queue_run_count == 1)? "" : "es");
         break;
         }

-      }

     }
   }
 }
     }
   }
 }


@@ -914,6 +922,7 @@ int *listen_sockets = NULL;
 int listen_socket_count = 0;
 ip_address_item *addresses = NULL;
 time_t last_connection_time = (time_t)0;
 int listen_socket_count = 0;
 ip_address_item *addresses = NULL;
 time_t last_connection_time = (time_t)0;

+int local_queue_run_max = atoi(CS expand_string(queue_run_max));

 
 /* If any debugging options are set, turn on the D_pid bit so that all
 debugging lines get the pid added. */
 
 /* If any debugging options are set, turn on the D_pid bit so that all
 debugging lines get the pid added. */


@@ -922,16 +931,13 @@ DEBUG(D_any|D_v) debug_selector |= D_pid;
 
 if (inetd_wait_mode)
   {
 
 if (inetd_wait_mode)
   {

-  int on = 1;
-

   listen_socket_count = 1;
   listen_socket_count = 1;

-  listen_sockets = store_get(sizeof(int *));
+  listen_sockets = store_get(sizeof(int));

   (void) close(3);
   if (dup2(0, 3) == -1)
   (void) close(3);
   if (dup2(0, 3) == -1)

-    {

     log_write(0, LOG_MAIN|LOG_PANIC_DIE,
         "failed to dup inetd socket safely away: %s", strerror(errno));
     log_write(0, LOG_MAIN|LOG_PANIC_DIE,
         "failed to dup inetd socket safely away: %s", strerror(errno));

-    }
+

   listen_sockets[0] = 3;
   (void) close(0);
   (void) close(1);
   listen_sockets[0] = 3;
   (void) close(0);
   (void) close(1);


@@ -955,8 +961,10 @@ if (inetd_wait_mode)
   /* As per below, when creating sockets ourselves, we handle tcp_nodelay for
   our own buffering; we assume though that inetd set the socket REUSEADDR. */
 
   /* As per below, when creating sockets ourselves, we handle tcp_nodelay for
   our own buffering; we assume though that inetd set the socket REUSEADDR. */
 

-  if (tcp_nodelay) setsockopt(3, IPPROTO_TCP, TCP_NODELAY,
-    (uschar *)(&on), sizeof(on));
+  if (tcp_nodelay)
+    if (setsockopt(3, IPPROTO_TCP, TCP_NODELAY, US &on, sizeof(on)))
+      log_write(0, LOG_MAIN|LOG_PANIC_DIE, "failed to set socket NODELAY: %s",
+       strerror(errno));

   }
 
 
   }
 
 


@@ -1048,7 +1056,7 @@ if (daemon_listen && !inetd_wait_mode)
   int sep;
   int pct = 0;
   uschar *s;
   int sep;
   int pct = 0;
   uschar *s;

-  uschar *list;
+  const uschar * list;

   uschar *local_iface_source = US"local_interfaces";
   ip_address_item *ipa;
   ip_address_item **pipa;
   uschar *local_iface_source = US"local_interfaces";
   ip_address_item *ipa;
   ip_address_item **pipa;


@@ -1071,8 +1079,7 @@ if (daemon_listen && !inetd_wait_mode)
 
     list = override_local_interfaces;
     sep = 0;
 
     list = override_local_interfaces;
     sep = 0;

-    while ((s = string_nextinlist(&list,&sep,big_buffer,big_buffer_size))
-           != NULL)
+    while ((s = string_nextinlist(&list, &sep, big_buffer, big_buffer_size)))

       {
       uschar joinstr[4];
       uschar **ptr;
       {
       uschar joinstr[4];
       uschar **ptr;


@@ -1096,11 +1103,11 @@ if (daemon_listen && !inetd_wait_mode)
         {
         joinstr[0] = sep;
         joinstr[1] = ' ';
         {
         joinstr[0] = sep;
         joinstr[1] = ' ';

-        *ptr = string_cat(*ptr, sizeptr, ptrptr, US"<", 1);
+        *ptr = string_catn(*ptr, sizeptr, ptrptr, US"<", 1);

         }
 
         }
 

-      *ptr = string_cat(*ptr, sizeptr, ptrptr, joinstr, 2);
-      *ptr = string_cat(*ptr, sizeptr, ptrptr, s, Ustrlen(s));
+      *ptr = string_catn(*ptr, sizeptr, ptrptr, joinstr, 2);
+      *ptr = string_cat (*ptr, sizeptr, ptrptr, s);

       }
 
     if (new_smtp_port != NULL)
       }
 
     if (new_smtp_port != NULL)


@@ -1122,18 +1129,18 @@ if (daemon_listen && !inetd_wait_mode)
     }
 
   /* Create a list of default SMTP ports, to be used if local_interfaces
     }
 
   /* Create a list of default SMTP ports, to be used if local_interfaces

-  contains entries without explict ports. First count the number of ports, then
+  contains entries without explicit ports. First count the number of ports, then

   build a translated list in a vector. */
 
   list = daemon_smtp_port;
   sep = 0;
   build a translated list in a vector. */
 
   list = daemon_smtp_port;
   sep = 0;

-  while ((s = string_nextinlist(&list,&sep,big_buffer,big_buffer_size)))
+  while ((s = string_nextinlist(&list, &sep, big_buffer, big_buffer_size)))

     pct++;
   default_smtp_port = store_get((pct+1) * sizeof(int));
   list = daemon_smtp_port;
   sep = 0;
   for (pct = 0;
     pct++;
   default_smtp_port = store_get((pct+1) * sizeof(int));
   list = daemon_smtp_port;
   sep = 0;
   for (pct = 0;

-       (s = string_nextinlist(&list,&sep,big_buffer,big_buffer_size));
+       (s = string_nextinlist(&list, &sep, big_buffer, big_buffer_size));

        pct++)
     {
     if (isdigit(*s))
        pct++)
     {
     if (isdigit(*s))


@@ -1275,7 +1282,7 @@ if (daemon_listen && !inetd_wait_mode)
 
   for (ipa = addresses; ipa != NULL; ipa = ipa->next)
     listen_socket_count++;
 
   for (ipa = addresses; ipa != NULL; ipa = ipa->next)
     listen_socket_count++;

-  listen_sockets = store_get(sizeof(int *) * listen_socket_count);
+  listen_sockets = store_get(sizeof(int) * listen_socket_count);

 
   } /* daemon_listen but not inetd_wait_mode */
 
 
   } /* daemon_listen but not inetd_wait_mode */
 


@@ -1354,7 +1361,6 @@ the listening sockets if required. */
 if (daemon_listen && !inetd_wait_mode)
   {
   int sk;
 if (daemon_listen && !inetd_wait_mode)
   {
   int sk;

-  int on = 1;

   ip_address_item *ipa;
 
   /* For each IP address, create a socket, bind it to the appropriate port, and
   ip_address_item *ipa;
 
   /* For each IP address, create a socket, bind it to the appropriate port, and


@@ -1380,8 +1386,7 @@ if (daemon_listen && !inetd_wait_mode)
       wildcard = ipa->address[0] == 0;
       }
 
       wildcard = ipa->address[0] == 0;
       }
 

-    listen_sockets[sk] = ip_socket(SOCK_STREAM, af);
-    if (listen_sockets[sk] < 0)
+    if ((listen_sockets[sk] = ip_socket(SOCK_STREAM, af)) < 0)

       {
       if (check_special_case(0, addresses, ipa, FALSE))
         {
       {
       if (check_special_case(0, addresses, ipa, FALSE))
         {


@@ -1430,6 +1435,9 @@ if (daemon_listen && !inetd_wait_mode)
     necessary for (some release of) USAGI Linux; other IP stacks fail at the
     listen() stage instead. */
 
     necessary for (some release of) USAGI Linux; other IP stacks fail at the
     listen() stage instead. */
 

+#ifdef TCP_FASTOPEN
+    tcp_fastopen_ok = TRUE;
+#endif

     for(;;)
       {
       uschar *msg, *addr;
     for(;;)
       {
       uschar *msg, *addr;


@@ -1457,13 +1465,20 @@ if (daemon_listen && !inetd_wait_mode)
       }
 
     DEBUG(D_any)
       }
 
     DEBUG(D_any)

-      {

       if (wildcard)
         debug_printf("listening on all interfaces (IPv%c) port %d\n",
       if (wildcard)
         debug_printf("listening on all interfaces (IPv%c) port %d\n",

-          (af == AF_INET6)? '6' : '4', ipa->port);
+          af == AF_INET6 ? '6' : '4', ipa->port);

       else
         debug_printf("listening on %s port %d\n", ipa->address, ipa->port);
       else
         debug_printf("listening on %s port %d\n", ipa->address, ipa->port);

+
+#ifdef TCP_FASTOPEN
+    if (setsockopt(listen_sockets[sk], IPPROTO_TCP, TCP_FASTOPEN,
+                   &smtp_connect_backlog, sizeof(smtp_connect_backlog)))
+      {
+      DEBUG(D_any) debug_printf("setsockopt FASTOPEN: %s\n", strerror(errno));
+      tcp_fastopen_ok = FALSE;

       }
       }

+#endif

 
     /* Start listening on the bound socket, establishing the maximum backlog of
     connections that is allowed. On success, continue to the next address. */
 
     /* Start listening on the bound socket, establishing the maximum backlog of
     connections that is allowed. On success, continue to the next address. */


@@ -1478,8 +1493,8 @@ if (daemon_listen && !inetd_wait_mode)
 
     if (!check_special_case(errno, addresses, ipa, TRUE))
       log_write(0, LOG_PANIC_DIE, "listen() failed on interface %s: %s",
 
     if (!check_special_case(errno, addresses, ipa, TRUE))
       log_write(0, LOG_PANIC_DIE, "listen() failed on interface %s: %s",

-        wildcard? ((af == AF_INET6)? US"(any IPv6)" : US"(any IPv4)") :
-        ipa->address,
+        wildcard
+       ? af == AF_INET6 ? US"(any IPv6)" : US"(any IPv4)" : ipa->address,

         strerror(errno));
 
     DEBUG(D_any) debug_printf("wildcard IPv4 listen() failed after IPv6 "
         strerror(errno));
 
     DEBUG(D_any) debug_printf("wildcard IPv4 listen() failed after IPv6 "


@@ -1571,11 +1586,11 @@ originator_login = ((pw = getpwuid(exim_uid)) != NULL)?
 /* Get somewhere to keep the list of queue-runner pids if we are keeping track
 of them (and also if we are doing queue runs). */
 
 /* Get somewhere to keep the list of queue-runner pids if we are keeping track
 of them (and also if we are doing queue runs). */
 

-if (queue_interval > 0 && queue_run_max > 0)
+if (queue_interval > 0 && local_queue_run_max > 0)

   {
   int i;
   {
   int i;

-  queue_pid_slots = store_get(queue_run_max * sizeof(pid_t));
-  for (i = 0; i < queue_run_max; i++) queue_pid_slots[i] = 0;
+  queue_pid_slots = store_get(local_queue_run_max * sizeof(pid_t));
+  for (i = 0; i < local_queue_run_max; i++) queue_pid_slots[i] = 0;

   }
 
 /* Set up the handler for termination of child processes. */
   }
 
 /* Set up the handler for termination of child processes. */


@@ -1603,7 +1618,7 @@ if (inetd_wait_mode)
   log_write(0, LOG_MAIN,
     "exim %s daemon started: pid=%d, launched with listening socket, %s",
     version_string, getpid(), big_buffer);
   log_write(0, LOG_MAIN,
     "exim %s daemon started: pid=%d, launched with listening socket, %s",
     version_string, getpid(), big_buffer);

-  set_process_info("daemon: pre-listening socket");
+  set_process_info("daemon(%s): pre-listening socket", version_string);

 
   /* set up the timeout logic */
   sigalrm_seen = 1;
 
   /* set up the timeout logic */
   sigalrm_seen = 1;


@@ -1614,12 +1629,11 @@ else if (daemon_listen)
   int i, j;
   int smtp_ports = 0;
   int smtps_ports = 0;
   int i, j;
   int smtp_ports = 0;
   int smtps_ports = 0;

-  ip_address_item *ipa;
-  uschar *p = big_buffer;
-  uschar *qinfo = (queue_interval > 0)?
-    string_sprintf("-q%s", readconf_printtime(queue_interval))
-    :
-    US"no queue runs";
+  ip_address_item * ipa;
+  uschar * p = big_buffer;
+  uschar * qinfo = queue_interval > 0
+    ? string_sprintf("-q%s", readconf_printtime(queue_interval))
+    : US"no queue runs";

 
   /* Build a list of listening addresses in big_buffer, but limit it to 10
   items. The style is for backwards compatibility.
 
   /* Build a list of listening addresses in big_buffer, but limit it to 10
   items. The style is for backwards compatibility.


@@ -1630,30 +1644,30 @@ else if (daemon_listen)
 
   for (j = 0; j < 2; j++)
     {
 
   for (j = 0; j < 2; j++)
     {

-    for (i = 0, ipa = addresses; i < 10 && ipa != NULL; i++, ipa = ipa->next)
+    for (i = 0, ipa = addresses; i < 10 && ipa; i++, ipa = ipa->next)

        {
        /* First time round, look for SMTP ports; second time round, look for
        SMTPS ports. For the first one of each, insert leading text. */
 
        if (host_is_tls_on_connect_port(ipa->port) == (j > 0))
          {
        {
        /* First time round, look for SMTP ports; second time round, look for
        SMTPS ports. For the first one of each, insert leading text. */
 
        if (host_is_tls_on_connect_port(ipa->port) == (j > 0))
          {

-         if (j == 0)
-           {
-           if (smtp_ports++ == 0)
+        if (j == 0)
+          {
+          if (smtp_ports++ == 0)

              {
              memcpy(p, "SMTP on", 8);
              p += 7;
              }
              {
              memcpy(p, "SMTP on", 8);
              p += 7;
              }

-           }
-         else
-           {
-           if (smtps_ports++ == 0)
+          }
+        else
+          {
+          if (smtps_ports++ == 0)

              {
              (void)sprintf(CS p, "%sSMTPS on",
              {
              (void)sprintf(CS p, "%sSMTPS on",

-               (smtp_ports == 0)? "":" and for ");
-             while (*p != 0) p++;
+               smtp_ports == 0 ? "" : " and for ");
+             while (*p) p++;

              }
              }

-           }
+          }

 
          /* Now the information about the port (and sometimes interface) */
 
 
          /* Now the information about the port (and sometimes interface) */
 


@@ -1678,7 +1692,7 @@ else if (daemon_listen)
          }
        }
 
          }
        }
 

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

       {
       memcpy(p, " ...", 5);
       p += 4;
       {
       memcpy(p, " ...", 5);
       p += 4;


@@ -1688,22 +1702,24 @@ else if (daemon_listen)
   log_write(0, LOG_MAIN,
     "exim %s daemon started: pid=%d, %s, listening for %s",
     version_string, getpid(), qinfo, big_buffer);
   log_write(0, LOG_MAIN,
     "exim %s daemon started: pid=%d, %s, listening for %s",
     version_string, getpid(), qinfo, big_buffer);

-  set_process_info("daemon: %s, listening for %s", qinfo, big_buffer);
+  set_process_info("daemon(%s): %s, listening for %s",
+    version_string, qinfo, big_buffer);

   }
 
 else
   {
   }
 
 else
   {

+  uschar * s = *queue_name
+    ? string_sprintf("-qG%s/%s", queue_name, readconf_printtime(queue_interval))
+    : string_sprintf("-q%s", readconf_printtime(queue_interval));

   log_write(0, LOG_MAIN,
   log_write(0, LOG_MAIN,

-    "exim %s daemon started: pid=%d, -q%s, not listening for SMTP",
-    version_string, getpid(), readconf_printtime(queue_interval));
-  set_process_info("daemon: -q%s, not listening",
-    readconf_printtime(queue_interval));
+    "exim %s daemon started: pid=%d, %s, not listening for SMTP",
+    version_string, getpid(), s);
+  set_process_info("daemon(%s): %s, not listening", version_string, s);

   }
 
 /* Do any work it might be useful to amortize over our children
 (eg: compile regex) */
 
   }
 
 /* Do any work it might be useful to amortize over our children
 (eg: compile regex) */
 

-deliver_init();

 dns_pattern_init();
 
 #ifdef WITH_CONTENT_SCAN
 dns_pattern_init();
 
 #ifdef WITH_CONTENT_SCAN


@@ -1790,7 +1806,7 @@ for (;;)
       re-exec is required. */
 
       if (queue_interval > 0 &&
       re-exec is required. */
 
       if (queue_interval > 0 &&

-         (queue_run_max <= 0 || queue_run_count < queue_run_max))
+         (local_queue_run_max <= 0 || queue_run_count < local_queue_run_max))

         {
         if ((pid = fork()) == 0)
           {
         {
         if ((pid = fork()) == 0)
           {


@@ -1834,21 +1850,22 @@ for (;;)
             if (deliver_force_thaw) *p++ = 'f';
             if (queue_run_local) *p++ = 'l';
             *p = 0;
             if (deliver_force_thaw) *p++ = 'f';
             if (queue_run_local) *p++ = 'l';
             *p = 0;

-            extra[0] = opt;
+           extra[0] = queue_name
+             ? string_sprintf("%sG%s", opt, queue_name) : opt;

 
             /* If -R or -S were on the original command line, ensure they get
             passed on. */
 
 
             /* If -R or -S were on the original command line, ensure they get
             passed on. */
 

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

               {
               {

-              extra[extracount++] = deliver_selectstring_regex? US"-Rr" : US"-R";
+              extra[extracount++] = deliver_selectstring_regex ? US"-Rr" : US"-R";

               extra[extracount++] = deliver_selectstring;
               }
 
               extra[extracount++] = deliver_selectstring;
               }
 

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

               {
               {

-              extra[extracount++] = deliver_selectstring_sender_regex?
-                US"-Sr" : US"-S";
+              extra[extracount++] = deliver_selectstring_sender_regex
+               ? US"-Sr" : US"-S";

               extra[extracount++] = deliver_selectstring_sender;
               }
 
               extra[extracount++] = deliver_selectstring_sender;
               }
 


@@ -1875,15 +1892,13 @@ for (;;)
         else
           {
           int i;
         else
           {
           int i;

-          for (i = 0; i < queue_run_max; ++i)
-            {
+          for (i = 0; i < local_queue_run_max; ++i)

             if (queue_pid_slots[i] <= 0)
               {
               queue_pid_slots[i] = pid;
               queue_run_count++;
               break;
               }
             if (queue_pid_slots[i] <= 0)
               {
               queue_pid_slots[i] = pid;
               queue_run_count++;
               break;
               }

-            }

           DEBUG(D_any) debug_printf("%d queue-runner process%s running\n",
             queue_run_count, (queue_run_count == 1)? "" : "es");
           }
           DEBUG(D_any) debug_printf("%d queue-runner process%s running\n",
             queue_run_count, (queue_run_count == 1)? "" : "es");
           }