git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support moving messages across named queues. Bug 2456
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index 61a9c97962cdca0b1b7e6fd7ac6eb6231d5e2645..07665bf756b0ba9455284e7be61ce8a6f3051f4c 100644
(file)
--- 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
#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,
.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
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;
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_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";
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,
.pass_router = NULL,
.redirect_router = NULL,
- .dnssec =
{ NULL, NULL }, /* dnssec_domains {require,request} */
+ .dnssec =
{ .request= US"*", .require=NULL },
};
uschar *router_name = 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;
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;
transport_instance *transports = NULL;