Testsuite: Rename 4510-DKIM

[user/henk/code/exim.git] / src / src / daemon.c

diff --git a/src/src/daemon.c b/src/src/daemon.c
index 2efaeba95aab273ef6f5f49e17cbdddb4ed8bc59..d799ea4e85a0b54ba008495af8c398878bf34fc9 100644 (file)
--- a/src/src/daemon.c
+++ b/src/src/daemon.c
@@ -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 */


@@ -523,18 +518,23 @@ if (pid == 0)
       }
     else
       {
       }
     else
       {

-      int i;
-      uschar * buf[128];
-      mac_smtp_fflush();
-      /* drain socket, for clean TCP FINs */
-      for(i = 16; read(fileno(smtp_in), buf, sizeof(buf)) > 0 && i > 0; ) i--;
+      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 */
 
       /*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");
       search_tidyup();
       smtp_log_no_mail();                 /* Log no mail if configured */
 
       /*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 == 0)? EXIT_SUCCESS : EXIT_FAILURE);
+      _exit(rc ? EXIT_FAILURE : EXIT_SUCCESS);

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


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


@@ -606,23 +604,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.


@@ -676,10 +671,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));

-        }

       }
     }
   }
       }
     }
   }


@@ -690,14 +683,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;


@@ -706,7 +696,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");
   }


@@ -723,7 +712,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",


@@ -732,7 +721,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",


@@ -853,13 +842,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;


@@ -867,7 +855,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 */
     }
 


@@ -1130,7 +1117,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;


@@ -1470,10 +1457,9 @@ if (daemon_listen && !inetd_wait_mode)
         debug_printf("listening on %s port %d\n", ipa->address, ipa->port);
 
 #ifdef TCP_FASTOPEN
         debug_printf("listening on %s port %d\n", ipa->address, ipa->port);
 
 #ifdef TCP_FASTOPEN

-    if (setsockopt(listen_sockets[sk], SOL_TCP, TCP_FASTOPEN, &smtp_connect_backlog,
-                   sizeof(smtp_connect_backlog)))
-      log_write(0, LOG_MAIN|LOG_PANIC, "failed to set socket FASTOPEN: %s",
-       strerror(errno));
+    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));

 #endif
 
     /* Start listening on the bound socket, establishing the maximum backlog of
 #endif
 
     /* Start listening on the bound socket, establishing the maximum backlog of