X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/042e558f346b01902dd414206a047fa47b686f0b..fc7bae7f2fa3668ada9bd173e9f24c7166e1dd13:/src/src/globals.c diff --git a/src/src/globals.c b/src/src/globals.c index 61a9c9796..07665bf75 100644 --- a/src/src/globals.c +++ b/src/src/globals.c @@ -239,7 +239,7 @@ struct global_flags f = #ifndef DISABLE_DKIM .dkim_disable_verify = FALSE, #endif -#ifdef EXPERIMENTAL_DMARC +#ifdef SUPPORT_DMARC .dmarc_has_been_checked = FALSE, .dmarc_disable_verify = FALSE, .dmarc_enable_forensic = FALSE, @@ -838,7 +838,7 @@ uschar *dkim_verify_signers = US"$dkim_signers"; uschar *dkim_verify_status = NULL; uschar *dkim_verify_reason = NULL; #endif -#ifdef EXPERIMENTAL_DMARC +#ifdef SUPPORT_DMARC uschar *dmarc_domain_policy = NULL; uschar *dmarc_forensic_sender = NULL; uschar *dmarc_history_file = NULL; @@ -1194,6 +1194,7 @@ uschar *qualify_domain_sender = NULL; uschar *queue_domains = NULL; int queue_interval = -1; uschar *queue_name = US""; +uschar *queue_name_dest = NULL; uschar *queue_only_file = NULL; int queue_only_load = -1; uschar *queue_run_max = US"5"; @@ -1362,7 +1363,7 @@ router_instance router_defaults = { .pass_router = NULL, .redirect_router = NULL, - .dnssec = { NULL, NULL }, /* dnssec_domains {require,request} */ + .dnssec = { .request= US"*", .require=NULL }, }; uschar *router_name = NULL; @@ -1522,6 +1523,9 @@ uschar *tcp_wrappers_daemon_name = US TCP_WRAPPERS_DAEMON_NAME; int test_harness_load_avg = 0; int thismessage_size_limit = 0; int timeout_frozen_after = 0; +#ifdef MEASURE_TIMING +struct timeval timestamp_startup; +#endif transport_instance *transports = NULL;