X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/fd98a5c6771f3a5a686e54370b0525dcc3dca2f9..71da6ae46ebda11989094def47c4145e6286c67a:/src/src/readconf.c

diff --git a/src/src/readconf.c b/src/src/readconf.c
index bba532594..b1b26ff67 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -211,15 +211,20 @@ static optionlist optionlist_config[] = {
   { "disable_ipv6",             opt_bool,        &disable_ipv6 },
 #ifndef DISABLE_DKIM
   { "dkim_verify_signers",      opt_stringptr,   &dkim_verify_signers },
+#endif
+#ifdef EXPERIMENTAL_DMARC
+  { "dmarc_forensic_sender",    opt_stringptr,   &dmarc_forensic_sender },
+  { "dmarc_history_file",       opt_stringptr,   &dmarc_history_file },
+  { "dmarc_tld_file",           opt_stringptr,   &dmarc_tld_file },
 #endif
   { "dns_again_means_nonexist", opt_stringptr,   &dns_again_means_nonexist },
   { "dns_check_names_pattern",  opt_stringptr,   &check_dns_names_pattern },
   { "dns_csa_search_limit",     opt_int,         &dns_csa_search_limit },
   { "dns_csa_use_reverse",      opt_bool,        &dns_csa_use_reverse },
+  { "dns_dnssec_ok",            opt_int,         &dns_dnssec_ok },
   { "dns_ipv4_lookup",          opt_stringptr,   &dns_ipv4_lookup },
   { "dns_retrans",              opt_time,        &dns_retrans },
   { "dns_retry",                opt_int,         &dns_retry },
-  { "dns_use_dnssec",           opt_int,         &dns_use_dnssec },
   { "dns_use_edns0",            opt_int,         &dns_use_edns0 },
  /* This option is now a no-op, retained for compability */
   { "drop_cr",                  opt_bool,        &drop_cr },
@@ -3824,7 +3829,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. */
 
@@ -3981,12 +3986,15 @@ uschar *p;
 
 /* Not receiving messages, don't need to parse the ACL data */
 
+/*XXX need to make this more selective */
+#ifndef EXPERIMENTAL_DBL
 if (skip)
   {
   DEBUG(D_acl) debug_printf("skipping ACL configuration - not needed\n");
   while ((p = get_config_line()) != NULL);
   return;
   }
+#endif
 
 /* Read each ACL and add it into the tree. Macro (re)definitions are allowed
 between ACLs. */