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
Add variables for wildcard portion of local-part affix. Bug 281
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index 8162de0c4d215368ecf660ddfe9fa2e0c2c1029f..4ce15acaaac7c98f37d08c02785adf13f770a146 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-16,23
+16,23
@@
data blocks and hence have the opt_public flag set. */
optionlist optionlist_auths[] = {
{ "client_condition", opt_stringptr | opt_public,
optionlist optionlist_auths[] = {
{ "client_condition", opt_stringptr | opt_public,
-
(void *)(offsetof(auth_instance, client_condition)
) },
+
OPT_OFF(auth_instance, client_condition
) },
{ "client_set_id", opt_stringptr | opt_public,
{ "client_set_id", opt_stringptr | opt_public,
-
(void *)(offsetof(auth_instance, set_client_id)
) },
+
OPT_OFF(auth_instance, set_client_id
) },
{ "driver", opt_stringptr | opt_public,
{ "driver", opt_stringptr | opt_public,
-
(void *)(offsetof(auth_instance, driver_name)
) },
+
OPT_OFF(auth_instance, driver_name
) },
{ "public_name", opt_stringptr | opt_public,
{ "public_name", opt_stringptr | opt_public,
-
(void *)(offsetof(auth_instance, public_name)
) },
+
OPT_OFF(auth_instance, public_name
) },
{ "server_advertise_condition", opt_stringptr | opt_public,
{ "server_advertise_condition", opt_stringptr | opt_public,
-
(void *)(offsetof(auth_instance, advertise_condition)
)},
+
OPT_OFF(auth_instance, advertise_condition
)},
{ "server_condition", opt_stringptr | opt_public,
{ "server_condition", opt_stringptr | opt_public,
-
(void *)(offsetof(auth_instance, server_condition)
) },
+
OPT_OFF(auth_instance, server_condition
) },
{ "server_debug_print", opt_stringptr | opt_public,
{ "server_debug_print", opt_stringptr | opt_public,
-
(void *)(offsetof(auth_instance, server_debug_string)
) },
+
OPT_OFF(auth_instance, server_debug_string
) },
{ "server_mail_auth_condition", opt_stringptr | opt_public,
{ "server_mail_auth_condition", opt_stringptr | opt_public,
-
(void *)(offsetof(auth_instance, mail_auth_condition)
) },
+
OPT_OFF(auth_instance, mail_auth_condition
) },
{ "server_set_id", opt_stringptr | opt_public,
{ "server_set_id", opt_stringptr | opt_public,
-
(void *)(offsetof(auth_instance, set_id)
) }
+
OPT_OFF(auth_instance, set_id
) }
};
int optionlist_auths_size = nelem(optionlist_auths);
};
int optionlist_auths_size = nelem(optionlist_auths);
@@
-312,6
+312,8
@@
struct global_flags f =
.synchronous_delivery = FALSE,
.system_filtering = FALSE,
.synchronous_delivery = FALSE,
.system_filtering = FALSE,
+ .taint_check_slow = FALSE,
+ .testsuite_delays = TRUE,
.tcp_fastopen_ok = FALSE,
.tcp_in_fastopen = FALSE,
.tcp_in_fastopen_data = FALSE,
.tcp_fastopen_ok = FALSE,
.tcp_in_fastopen = FALSE,
.tcp_in_fastopen_data = FALSE,
@@
-378,6
+380,9
@@
BOOL prod_requires_admin = TRUE;
BOOL proxy_session = FALSE;
#endif
BOOL proxy_session = FALSE;
#endif
+#ifdef EXPERIMENTAL_QUEUE_RAMP
+BOOL queue_fast_ramp = FALSE;
+#endif
BOOL queue_list_requires_admin = TRUE;
BOOL queue_only = FALSE;
BOOL queue_only_load_latch = TRUE;
BOOL queue_list_requires_admin = TRUE;
BOOL queue_only = FALSE;
BOOL queue_only_load_latch = TRUE;
@@
-536,7
+541,9
@@
address_item address_defaults = {
.lc_local_part = NULL,
.local_part = NULL,
.prefix = NULL,
.lc_local_part = NULL,
.local_part = NULL,
.prefix = NULL,
+ .prefix_v = NULL,
.suffix = NULL,
.suffix = NULL,
+ .suffix_v = NULL,
.domain = NULL,
.address_retry_key = NULL,
.domain_retry_key = NULL,
.domain = NULL,
.address_retry_key = NULL,
.domain_retry_key = NULL,
@@
-573,7
+580,7
@@
address_item address_defaults = {
.localpart_cache = { 0 }, /* localpart_cache - ditto */
.mode = -1,
.more_errno = 0,
.localpart_cache = { 0 }, /* localpart_cache - ditto */
.mode = -1,
.more_errno = 0,
- .delivery_
usec = 0
,
+ .delivery_
time = {.tv_sec = 0, .tv_usec = 0}
,
.basic_errno = ERRNO_UNKNOWNERROR,
.child_count = 0,
.return_file = -1,
.basic_errno = ERRNO_UNKNOWNERROR,
.child_count = 0,
.return_file = -1,
@@
-735,6
+742,7
@@
cut_t cutthrough = {
.nrcpt = 0, /* number of addresses */
};
.nrcpt = 0, /* number of addresses */
};
+int daemon_notifier_fd = -1;
uschar *daemon_smtp_port = US"smtp";
int daemon_startup_retries = 9;
int daemon_startup_sleep = 30;
uschar *daemon_smtp_port = US"smtp";
int daemon_startup_retries = 9;
int daemon_startup_sleep = 30;
@@
-816,7
+824,10
@@
uschar *deliver_localpart_data = NULL;
uschar *deliver_localpart_orig = NULL;
uschar *deliver_localpart_parent = NULL;
uschar *deliver_localpart_prefix = NULL;
uschar *deliver_localpart_orig = NULL;
uschar *deliver_localpart_parent = NULL;
uschar *deliver_localpart_prefix = NULL;
+uschar *deliver_localpart_prefix_v = NULL;
uschar *deliver_localpart_suffix = NULL;
uschar *deliver_localpart_suffix = NULL;
+uschar *deliver_localpart_suffix_v = NULL;
+uschar *deliver_localpart_verified = NULL;
uschar *deliver_out_buffer = NULL;
int deliver_queue_load_max = -1;
address_item *deliver_recipients = NULL;
uschar *deliver_out_buffer = NULL;
int deliver_queue_load_max = -1;
address_item *deliver_recipients = NULL;
@@
-845,7
+856,7
@@
uschar *dmarc_forensic_sender = NULL;
uschar *dmarc_history_file = NULL;
uschar *dmarc_status = NULL;
uschar *dmarc_status_text = NULL;
uschar *dmarc_history_file = NULL;
uschar *dmarc_status = NULL;
uschar *dmarc_status_text = NULL;
-uschar *dmarc_tld_file =
US DMARC_TLD_FILE
;
+uschar *dmarc_tld_file =
NULL
;
uschar *dmarc_used_domain = NULL;
#endif
uschar *dmarc_used_domain = NULL;
#endif
@@
-1195,11
+1206,14
@@
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";
pid_t queue_run_pid = (pid_t)0;
int queue_run_pipe = -1;
uschar *queue_only_file = NULL;
int queue_only_load = -1;
uschar *queue_run_max = US"5";
pid_t queue_run_pid = (pid_t)0;
int queue_run_pipe = -1;
+unsigned queue_size = 0;
+time_t queue_size_next = 0;
uschar *queue_smtp_domains = NULL;
uint32_t random_seed = 0;
uschar *queue_smtp_domains = NULL;
uint32_t random_seed = 0;
@@
-1364,7
+1378,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;