Merge branch 'master' into transp_logging_1031

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

diff --git a/src/src/readconf.c b/src/src/readconf.c
index c2785b79af1eeeaf4c08625bc8a4cb4ce241bd9b..d0608d7dee8d94f0f44f306b8f4c95c977dcea96 100644 (file)
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -195,6 +195,9 @@ static optionlist optionlist_config[] = {
   { "daemon_smtp_ports",        opt_stringptr,   &daemon_smtp_port },
   { "daemon_startup_retries",   opt_int,         &daemon_startup_retries },
   { "daemon_startup_sleep",     opt_time,        &daemon_startup_sleep },
+#ifdef EXPERIMENTAL_DBL
+  { "dbl_delivery_query",       opt_stringptr,   &dbl_delivery_query },
+#endif
 #ifdef EXPERIMENTAL_DCC
   { "dcc_direct_add_header",    opt_bool,        &dcc_direct_add_header },
   { "dccifd_address",           opt_stringptr,   &dccifd_address },
@@ -3829,7 +3832,7 @@ while ((p = get_config_line()) != NULL)
   pp = p;
   while (mac_isgraph(*p)) p++;
   if (p - pp <= 0) log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN,
-    "missing error type");
+    "missing error type in retry rule");
 
   /* Test error names for things we understand. */