tidying

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

diff --git a/src/src/daemon.c b/src/src/daemon.c
index 3634ad448237df378740c0d3f838aff3f74b79de..1ec0fd2e089e9717bb416e00b9ca65cbf6623e53 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 - 2016 */
+/* 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 };
 


@@ -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);


@@ -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)
     {


@@ -390,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)
         {


@@ -407,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 */


@@ -515,6 +510,7 @@ if (pid == 0)
       search_tidyup();                    /* Close cached databases */
       if (!ok)                            /* Connection was dropped */
         {
       search_tidyup();                    /* Close cached databases */
       if (!ok)                            /* Connection was dropped */
         {

+       cancel_cutthrough_connection(TRUE, US"receive dropped");

         mac_smtp_fflush();
         smtp_log_no_mail();               /* Log no mail if configured */
         _exit(EXIT_SUCCESS);
         mac_smtp_fflush();
         smtp_log_no_mail();               /* Log no mail if configured */
         _exit(EXIT_SUCCESS);


@@ -523,10 +519,24 @@ 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--;
+       }
+      cancel_cutthrough_connection(TRUE, US"message setup dropped");

       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 */


@@ -534,9 +544,9 @@ if (pid == 0)
     DEBUG(D_receive)
       {
       int i;
     DEBUG(D_receive)
       {
       int i;

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

         debug_printf("Sender: %s\n", sender_address);
         debug_printf("Sender: %s\n", sender_address);

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

         {
         debug_printf("Recipients:\n");
         for (i = 0; i < recipients_count; i++)
         {
         debug_printf("Recipients:\n");
         for (i = 0; i < recipients_count; i++)


@@ -556,6 +566,17 @@ 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;
+    callout_address = 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


@@ -582,15 +603,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


@@ -598,23 +617,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.


@@ -639,9 +655,9 @@ if (pid == 0)
         /* Don't ever molest the parent's SSL connection, but do clean up
         the data structures if necessary. */
 
         /* Don't ever molest the parent's SSL connection, but do clean up
         the data structures if necessary. */
 

-        #ifdef SUPPORT_TLS
+#ifdef SUPPORT_TLS

         tls_close(TRUE, FALSE);
         tls_close(TRUE, FALSE);

-        #endif
+#endif

 
         /* Reset SIGHUP and SIGCHLD in the child in both cases. */
 
 
         /* Reset SIGHUP and SIGCHLD in the child in both cases. */
 


@@ -651,27 +667,28 @@ 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);
+         delivery_re_exec(CEE_EXEC_PANIC);

           /* Control does not return here. */
           }
 
         /* No need to re-exec; SIGALRM remains set to the default handler */
 
           /* Control does not return here. */
           }
 
         /* No need to re-exec; SIGALRM remains set to the default handler */
 

-        (void)deliver_message(message_id, FALSE, FALSE);
+        (void) deliver_message(message_id, FALSE, FALSE);

         search_tidyup();
         _exit(EXIT_SUCCESS);
         }
 
       if (dpid > 0)
         {
         search_tidyup();
         _exit(EXIT_SUCCESS);
         }
 
       if (dpid > 0)
         {

+       release_cutthrough_connection(US"passed for delivery");

         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

-        {
+       {
+       cancel_cutthrough_connection(TRUE, US"delivery fork failed");

         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));

-        }
+       }

       }
     }
   }
       }
     }
   }


@@ -682,14 +699,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;


@@ -698,7 +712,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");
   }


@@ -715,7 +728,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",


@@ -724,7 +737,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",


@@ -737,6 +750,8 @@ else (void)close(dup_accept_socket);
 the incoming host address and an expanded active_hostname. */
 
 log_close_all();
 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;
 }


@@ -845,13 +860,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;


@@ -859,7 +873,6 @@ 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 (i < smtp_accept_max) continue;  /* Found an accepting process */
     }
 


@@ -868,7 +881,7 @@ while ((pid = waitpid(-1, &status, WNOHANG)) > 0)
 
   if (queue_pid_slots)
     {
 
   if (queue_pid_slots)
     {

-    int max = atoi(expand_string(queue_run_max));
+    int max = atoi(CS expand_string(queue_run_max));

     for (i = 0; i < max; i++)
       if (queue_pid_slots[i] == pid)
         {
     for (i = 0; i < max; i++)
       if (queue_pid_slots[i] == pid)
         {


@@ -915,7 +928,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(expand_string(queue_run_max));
+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. */


@@ -924,8 +937,6 @@ 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_sockets = store_get(sizeof(int));
   (void) close(3);
   listen_socket_count = 1;
   listen_sockets = store_get(sizeof(int));
   (void) close(3);


@@ -1124,7 +1135,7 @@ 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;
   build a translated list in a vector. */
 
   list = daemon_smtp_port;


@@ -1195,11 +1206,12 @@ if (daemon_listen && !inetd_wait_mode)
   In the same scan, fill in missing port numbers from the default list. When
   there is more than one item in the list, extra items are created. */
 
   In the same scan, fill in missing port numbers from the default list. When
   there is more than one item in the list, extra items are created. */
 

-  for (ipa = addresses; ipa != NULL; ipa = ipa->next)
+  for (ipa = addresses; ipa; ipa = ipa->next)

     {
     int i;
 
     {
     int i;
 

-    if (Ustrcmp(ipa->address, "0.0.0.0") == 0) ipa->address[0] = 0;
+    if (Ustrcmp(ipa->address, "0.0.0.0") == 0)
+      ipa->address[0] = 0;

     else if (Ustrcmp(ipa->address, "::0") == 0)
       {
       ipa->address[0] = ':';
     else if (Ustrcmp(ipa->address, "::0") == 0)
       {
       ipa->address[0] = ':';


@@ -1211,12 +1223,14 @@ if (daemon_listen && !inetd_wait_mode)
     if (daemon_smtp_port[0] <= 0)
       log_write(0, LOG_MAIN|LOG_PANIC_DIE, "no port specified for interface "
         "%s and daemon_smtp_port is unset; cannot start daemon",
     if (daemon_smtp_port[0] <= 0)
       log_write(0, LOG_MAIN|LOG_PANIC_DIE, "no port specified for interface "
         "%s and daemon_smtp_port is unset; cannot start daemon",

-        (ipa->address[0] == 0)? US"\"all IPv4\"" :
-        (ipa->address[1] == 0)? US"\"all IPv6\"" : ipa->address);
+        ipa->address[0] == 0 ? US"\"all IPv4\"" :
+        ipa->address[1] == 0 ? US"\"all IPv6\"" : ipa->address);
+

     ipa->port = default_smtp_port[0];
     for (i = 1; default_smtp_port[i] > 0; i++)
       {
       ip_address_item *new = store_get(sizeof(ip_address_item));
     ipa->port = default_smtp_port[0];
     for (i = 1; default_smtp_port[i] > 0; i++)
       {
       ip_address_item *new = store_get(sizeof(ip_address_item));

+

       memcpy(new->address, ipa->address, Ustrlen(ipa->address) + 1);
       new->port = default_smtp_port[i];
       new->next = ipa->next;
       memcpy(new->address, ipa->address, Ustrlen(ipa->address) + 1);
       new->port = default_smtp_port[i];
       new->next = ipa->next;


@@ -1231,15 +1245,14 @@ if (daemon_listen && !inetd_wait_mode)
   also simplifies the construction of the "daemon started" log line. */
 
   pipa = &addresses;
   also simplifies the construction of the "daemon started" log line. */
 
   pipa = &addresses;

-  for (ipa = addresses; ipa != NULL; pipa = &(ipa->next), ipa = ipa->next)
+  for (ipa = addresses; ipa; pipa = &ipa->next, ipa = ipa->next)

     {
     ip_address_item *ipa2;
 
     /* Handle an IPv4 wildcard */
 
     if (ipa->address[0] == 0)
     {
     ip_address_item *ipa2;
 
     /* Handle an IPv4 wildcard */
 
     if (ipa->address[0] == 0)

-      {
-      for (ipa2 = ipa; ipa2->next != NULL; ipa2 = ipa2->next)
+      for (ipa2 = ipa; ipa2->next; ipa2 = ipa2->next)

         {
         ip_address_item *ipa3 = ipa2->next;
         if (ipa3->address[0] == ':' &&
         {
         ip_address_item *ipa3 = ipa2->next;
         if (ipa3->address[0] == ':' &&


@@ -1252,13 +1265,11 @@ if (daemon_listen && !inetd_wait_mode)
           break;
           }
         }
           break;
           }
         }

-      }

 
     /* Handle an IPv6 wildcard. */
 
     else if (ipa->address[0] == ':' && ipa->address[1] == 0)
 
     /* Handle an IPv6 wildcard. */
 
     else if (ipa->address[0] == ':' && ipa->address[1] == 0)

-      {
-      for (ipa2 = ipa; ipa2->next != NULL; ipa2 = ipa2->next)
+      for (ipa2 = ipa; ipa2->next; ipa2 = ipa2->next)

         {
         ip_address_item *ipa3 = ipa2->next;
         if (ipa3->address[0] == 0 && ipa3->port == ipa->port)
         {
         ip_address_item *ipa3 = ipa2->next;
         if (ipa3->address[0] == 0 && ipa3->port == ipa->port)


@@ -1270,12 +1281,11 @@ if (daemon_listen && !inetd_wait_mode)
           break;
           }
         }
           break;
           }
         }

-      }

     }
 
   /* Get a vector to remember all the sockets in */
 
     }
 
   /* Get a vector to remember all the sockets in */
 

-  for (ipa = addresses; ipa != NULL; ipa = ipa->next)
+  for (ipa = addresses; ipa; ipa = ipa->next)

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


@@ -1356,7 +1366,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


@@ -1398,13 +1407,13 @@ if (daemon_listen && !inetd_wait_mode)
     available. Just log failure (can get protocol not available, just like
     socket creation can). */
 
     available. Just log failure (can get protocol not available, just like
     socket creation can). */
 

-    #ifdef IPV6_V6ONLY
+#ifdef IPV6_V6ONLY

     if (af == AF_INET6 && wildcard &&
         setsockopt(listen_sockets[sk], IPPROTO_IPV6, IPV6_V6ONLY, (char *)(&on),
           sizeof(on)) < 0)
       log_write(0, LOG_MAIN, "Setting IPV6_V6ONLY on daemon's IPv6 wildcard "
         "socket failed (%s): carrying on without it", strerror(errno));
     if (af == AF_INET6 && wildcard &&
         setsockopt(listen_sockets[sk], IPPROTO_IPV6, IPV6_V6ONLY, (char *)(&on),
           sizeof(on)) < 0)
       log_write(0, LOG_MAIN, "Setting IPV6_V6ONLY on daemon's IPv6 wildcard "
         "socket failed (%s): carrying on without it", strerror(errno));

-    #endif  /* IPV6_V6ONLY */
+#endif  /* IPV6_V6ONLY */

 
     /* Set SO_REUSEADDR so that the daemon can be restarted while a connection
     is being handled.  Without this, a connection will prevent reuse of the
 
     /* Set SO_REUSEADDR so that the daemon can be restarted while a connection
     is being handled.  Without this, a connection will prevent reuse of the


@@ -1431,6 +1440,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;


@@ -1443,8 +1455,11 @@ if (daemon_listen && !inetd_wait_mode)
         goto SKIP_SOCKET;
         }
       msg = US strerror(errno);
         goto SKIP_SOCKET;
         }
       msg = US strerror(errno);

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

       if (daemon_startup_retries <= 0)
         log_write(0, LOG_MAIN|LOG_PANIC_DIE,
           "socket bind() to port %d for address %s failed: %s: "
       if (daemon_startup_retries <= 0)
         log_write(0, LOG_MAIN|LOG_PANIC_DIE,
           "socket bind() to port %d for address %s failed: %s: "


@@ -1458,13 +1473,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. */


@@ -1479,8 +1501,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 "


@@ -1491,7 +1513,7 @@ if (daemon_listen && !inetd_wait_mode)
     are going to ignore. We remove the address from the chain, and back up the
     counts. */
 
     are going to ignore. We remove the address from the chain, and back up the
     counts. */
 

-    SKIP_SOCKET:
+  SKIP_SOCKET:

     sk--;                          /* Back up the count */
     listen_socket_count--;         /* Reduce the total */
     if (ipa == addresses) addresses = ipa->next; else
     sk--;                          /* Back up the count */
     listen_socket_count--;         /* Reduce the total */
     if (ipa == addresses) addresses = ipa->next; else


@@ -1507,7 +1529,8 @@ if (daemon_listen && !inetd_wait_mode)
 /* If we are not listening, we want to write a pid file only if -oP was
 explicitly given. */
 
 /* If we are not listening, we want to write a pid file only if -oP was
 explicitly given. */
 

-else if (override_pid_file_path == NULL) write_pid = FALSE;
+else if (!override_pid_file_path)
+  write_pid = FALSE;

 
 /* Write the pid to a known file for assistance in identification, if required.
 We do this before giving up root privilege, because on some systems it is
 
 /* Write the pid to a known file for assistance in identification, if required.
 We do this before giving up root privilege, because on some systems it is


@@ -1527,25 +1550,22 @@ if (running_in_test_harness || write_pid)
   {
   FILE *f;
 
   {
   FILE *f;
 

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

     pid_file_path = override_pid_file_path;
 
   if (pid_file_path[0] == 0)
     pid_file_path = string_sprintf("%s/exim-daemon.pid", spool_directory);
 
     pid_file_path = override_pid_file_path;
 
   if (pid_file_path[0] == 0)
     pid_file_path = string_sprintf("%s/exim-daemon.pid", spool_directory);
 

-  f = modefopen(pid_file_path, "wb", 0644);
-  if (f != NULL)
+  if ((f = modefopen(pid_file_path, "wb", 0644)))

     {
     (void)fprintf(f, "%d\n", (int)getpid());
     (void)fclose(f);
     DEBUG(D_any) debug_printf("pid written to %s\n", pid_file_path);
     }
   else
     {
     (void)fprintf(f, "%d\n", (int)getpid());
     (void)fclose(f);
     DEBUG(D_any) debug_printf("pid written to %s\n", pid_file_path);
     }
   else

-    {

     DEBUG(D_any)
       debug_printf("%s\n", string_open_failed(errno, "pid file %s",
         pid_file_path));
     DEBUG(D_any)
       debug_printf("%s\n", string_open_failed(errno, "pid file %s",
         pid_file_path));

-    }

   }
 
 /* Set up the handler for SIGHUP, which causes a restart of the daemon. */
   }
 
 /* Set up the handler for SIGHUP, which causes a restart of the daemon. */


@@ -1615,12 +1635,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.


@@ -1631,55 +1650,59 @@ 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)
-       {
-       /* 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)
-             {
-             memcpy(p, "SMTP on", 8);
-             p += 7;
-             }
-           }
-         else
-           {
-           if (smtps_ports++ == 0)
-             {
-             (void)sprintf(CS p, "%sSMTPS on",
-               (smtp_ports == 0)? "":" and for ");
-             while (*p != 0) p++;
-             }
-           }
-
-         /* Now the information about the port (and sometimes interface) */
-
-         if (ipa->address[0] == ':' && ipa->address[1] == 0)
-           {
-           if (ipa->next != NULL && ipa->next->address[0] == 0 &&
-               ipa->next->port == ipa->port)
-             {
-             (void)sprintf(CS p, " port %d (IPv6 and IPv4)", ipa->port);
-             ipa = ipa->next;
-             }
-           else if (ipa->v6_include_v4)
-             (void)sprintf(CS p, " port %d (IPv6 with IPv4)", ipa->port);
-           else
-             (void)sprintf(CS p, " port %d (IPv6)", ipa->port);
-           }
-         else if (ipa->address[0] == 0)
-           (void)sprintf(CS p, " port %d (IPv4)", ipa->port);
-         else
-           (void)sprintf(CS p, " [%s]:%d", ipa->address, ipa->port);
-         while (*p != 0) p++;
-         }
-       }
-
-    if (ipa != NULL)
+    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))
+       {
+       if (j == 0)
+         {
+         if (smtp_ports++ == 0)
+           {
+           memcpy(p, "SMTP on", 8);
+           p += 7;
+           }
+         }
+       else
+         if (smtps_ports++ == 0)
+           p += sprintf(CS p, "%sSMTPS on",
+             smtp_ports == 0 ? "" : " and for ");
+
+       /* Now the information about the port (and sometimes interface) */
+
+       if (ipa->address[0] == ':' && ipa->address[1] == 0)
+         {
+         if (ipa->next && ipa->next->address[0] == 0 &&
+             ipa->next->port == ipa->port)
+           {
+           p += sprintf(CS p, " port %d (IPv6 and IPv4)", ipa->port);
+           ipa = ipa->next;
+           }
+         else if (ipa->v6_include_v4)
+           p += sprintf(CS p, " port %d (IPv6 with IPv4)", ipa->port);
+         else
+           p += sprintf(CS p, " port %d (IPv6)", ipa->port);
+         }
+       else if (ipa->address[0] == 0)
+         p += sprintf(CS p, " port %d (IPv4)", ipa->port);
+       else if (  i > 0
+               && host_is_tls_on_connect_port(ipa[-1].port) == (j > 0)
+               && Ustrcmp(ipa->address, ipa[-1].address) == 0
+               )
+         {
+         if (p[-1] == '}') p--;
+         while (isdigit(*--p)) ;
+         p += sprintf(CS p+1, "%s%d,%d}", *p == ',' ? "" : "{",
+           ipa[-1].port, ipa->port);
+         }
+       else
+         p += sprintf(CS p, " [%s]:%d", ipa->address, ipa->port);
+       }
+      }
+
+    if (ipa)

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


@@ -1689,17 +1712,19 @@ 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): %s, listening for %s", version_string, 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(%s): -q%s, not listening",
-    version_string,
-    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
   }
 
 /* Do any work it might be useful to amortize over our children


@@ -1835,24 +1860,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;

-           if (queue_name)
-             extra[0] = string_sprintf("%sG%s", opt, queue_name);
-           else
-             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;
               }
 


@@ -1938,10 +1961,8 @@ for (;;)
       errno = EINTR;
       }
     else
       errno = EINTR;
       }
     else

-      {

       lcount = select(max_socket + 1, (SELECT_ARG2_TYPE *)&select_listen,
         NULL, NULL, NULL);
       lcount = select(max_socket + 1, (SELECT_ARG2_TYPE *)&select_listen,
         NULL, NULL, NULL);

-      }

 
     if (lcount < 0)
       {
 
     if (lcount < 0)
       {


@@ -1967,10 +1988,9 @@ for (;;)
     while (lcount-- > 0)
       {
       int accept_socket = -1;
     while (lcount-- > 0)
       {
       int accept_socket = -1;

+

       if (!select_failed)
       if (!select_failed)

-        {

         for (sk = 0; sk < listen_socket_count; sk++)
         for (sk = 0; sk < listen_socket_count; sk++)

-          {

           if (FD_ISSET(listen_sockets[sk], &select_listen))
             {
             len = sizeof(accepted);
           if (FD_ISSET(listen_sockets[sk], &select_listen))
             {
             len = sizeof(accepted);


@@ -1979,8 +1999,6 @@ for (;;)
             FD_CLR(listen_sockets[sk], &select_listen);
             break;
             }
             FD_CLR(listen_sockets[sk], &select_listen);
             break;
             }

-          }
-        }

 
       /* If select or accept has failed and this was not caused by an
       interruption, log the incident and try again. With asymmetric TCP/IP
 
       /* If select or accept has failed and this was not caused by an
       interruption, log the incident and try again. With asymmetric TCP/IP