inetd wait mode support with -bw

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

diff --git a/src/src/exim.c b/src/src/exim.c
index 90ecd0629631b9dcfdb7186117a17d935b45ff48..b53d6ca9b98afb2c61f3639fd8ed9417f41ea361 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -2060,6 +2060,24 @@ for (i = 1; i < argc; i++)
       show_whats_supported(stdout);
       }
 
       show_whats_supported(stdout);
       }
 

+    /* -bw: inetd wait mode, accept a listening socket as stdin */
+
+    else if (*argrest == 'w')
+      {
+      inetd_wait_mode = TRUE;
+      background_daemon = FALSE;
+      daemon_listen = TRUE;
+      if (*(++argrest) != '\0')
+        {
+        inetd_wait_timeout = readconf_readtime(argrest, 0, FALSE);
+        if (inetd_wait_timeout <= 0)
+          {
+          fprintf(stderr, "exim: bad time value %s: abandoned\n", argv[i]);
+          exit(EXIT_FAILURE);
+          }
+        }
+      }
+

     else badarg = TRUE;
     break;
 
     else badarg = TRUE;
     break;
 


@@ -3222,6 +3240,9 @@ if ((
     daemon_listen && queue_interval == 0
     ) ||
     (
     daemon_listen && queue_interval == 0
     ) ||
     (

+    inetd_wait_mode && queue_interval >= 0
+    ) ||
+    (

     list_options &&
     (checking || smtp_input || extract_recipients ||
       filter_test != FTEST_NONE || bi_option)
     list_options &&
     (checking || smtp_input || extract_recipients ||
       filter_test != FTEST_NONE || bi_option)


@@ -4406,7 +4427,7 @@ returns. We leave this till here so that the originator_ fields are available
 for incoming messages via the daemon. The daemon cannot be run in mua_wrapper
 mode. */
 
 for incoming messages via the daemon. The daemon cannot be run in mua_wrapper
 mode. */
 

-if (daemon_listen || queue_interval > 0)
+if (daemon_listen || inetd_wait_mode || queue_interval > 0)

   {
   if (mua_wrapper)
     {
   {
   if (mua_wrapper)
     {