Fix "-bP smtp_receive_timeout". Bug 2384

(cherry picked from commit e6024a5e9e193f559508d05ee401ae8f7f3c25ae)
(cherry picked from commit 2cf1c24f203b3995cfa4434907cff05917a55c90)

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index b63226b919abbbf10d0a7daacd745bf0aacec179..12cbd5b4c68be596b4e278789cab4dfbda8d07a5 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -44,6 +44,9 @@ JH/11 Harden plaintext authenticator against a badly misconfigured client-send
       string.  Previously it was possible to cause undefined behaviour in a
       library routine (usually a crash).  Found by "zerons".
 
       string.  Previously it was possible to cause undefined behaviour in a
       library routine (usually a crash).  Found by "zerons".
 

+JH/12 Bug 2384: fix "-bP smtp_receive_timeout".  Previously it returned no
+      output.
+

 
 
 Exim version 4.92
 
 
 Exim version 4.92

diff --git a/src/src/readconf.c b/src/src/readconf.c
index 5742d10ae24da0b16c7196d4445366a9bf5cea8a..10bde5576ca881035c7cc0ec3f3b437520ffbf7f 100644 (file)
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -19,7 +19,7 @@ implementation of the conditional .ifdef etc. */
 
 
 static uschar * syslog_facility_str;
 
 
 static uschar * syslog_facility_str;

-static void fn_smtp_receive_timeout(const uschar *, const uschar *);
+static void fn_smtp_receive_timeout(const uschar *, const uschar *, unsigned);

 
 /*************************************************
 *           Main configuration options           *
 
 /*************************************************
 *           Main configuration options           *


@@ -392,7 +392,8 @@ static int optionlist_config_size = nelem(optionlist_config);
 
 #ifdef MACRO_PREDEF
 
 
 #ifdef MACRO_PREDEF
 

-static void fn_smtp_receive_timeout(const uschar * name, const uschar * str) {/*Dummy*/}
+static void
+fn_smtp_receive_timeout(const uschar * name, const uschar * str, unsigned flags) {/*Dummy*/}

 
 void
 options_main(void)
 
 void
 options_main(void)


@@ -559,6 +560,8 @@ static syslog_fac_item syslog_list[] = {
 static int syslog_list_size = sizeof(syslog_list)/sizeof(syslog_fac_item);
 
 
 static int syslog_list_size = sizeof(syslog_list)/sizeof(syslog_fac_item);
 
 

+#define opt_fn_print           BIT(0)
+#define opt_fn_print_label     BIT(1)

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


@@ -1532,9 +1535,16 @@ return yield;
 *            Custom-handler options              *
 *************************************************/
 static void
 *            Custom-handler options              *
 *************************************************/
 static void

-fn_smtp_receive_timeout(const uschar * name, const uschar * str)
+fn_smtp_receive_timeout(const uschar * name, const uschar * str, unsigned flags)

 {
 {

-if (*str == '$')
+if (flags & opt_fn_print)
+  {
+  if (flags & opt_fn_print_label) printf("%s = ", name);
+  printf("%s\n", smtp_receive_timeout_s
+    ? string_printing2(smtp_receive_timeout_s, FALSE)
+    : readconf_printtime(smtp_receive_timeout));
+  }
+else if (*str == '$')

   smtp_receive_timeout_s = string_copy(str);
 else
   {
   smtp_receive_timeout_s = string_copy(str);
 else
   {


@@ -2328,7 +2338,7 @@ switch (type)
   case opt_func:
     {
     void (*fn)() = ol->value;
   case opt_func:
     {
     void (*fn)() = ol->value;

-    fn(name, s);
+    fn(name, s, 0);

     break;
     }
   }
     break;
     }
   }


@@ -2670,6 +2680,13 @@ switch(ol->type & opt_mask)
   case opt_bool_set:
     printf("%s%s\n", (*((BOOL *)value))? "" : "no_", name);
     break;
   case opt_bool_set:
     printf("%s%s\n", (*((BOOL *)value))? "" : "no_", name);
     break;

+
+  case opt_func:
+    {
+    void (*fn)() = ol->value;
+    fn(name, NULL, no_labels ? opt_fn_print : opt_fn_print|opt_fn_print_label);
+    break;
+    }

   }
 return TRUE;
 }
   }
 return TRUE;
 }