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
Merge branch 'exim-4.96+security' into master+security
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index 7af345465cdfd511df52b59da543bbba0f30f259..f945379a082ac9fb0ac46099c468d6ffde13cfbe 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-291,8
+291,6
@@
struct global_flags f =
.queue_2stage = FALSE,
.queue_only_policy = FALSE,
.queue_2stage = FALSE,
.queue_only_policy = FALSE,
- .queue_run_first_delivery = FALSE,
- .queue_run_force = FALSE,
.queue_run_local = FALSE,
.queue_running = FALSE,
.queue_smtp = FALSE,
.queue_run_local = FALSE,
.queue_running = FALSE,
.queue_smtp = FALSE,
@@
-389,7
+387,7
@@
BOOL mua_wrapper = FALSE;
BOOL preserve_message_logs = FALSE;
BOOL print_topbitchars = FALSE;
BOOL prod_requires_admin = TRUE;
BOOL preserve_message_logs = FALSE;
BOOL print_topbitchars = FALSE;
BOOL prod_requires_admin = TRUE;
-#if defined(SUPPORT_PROXY) || defined(SUPPORT_SOCKS)
+#if defined(SUPPORT_PROXY) || defined(SUPPORT_SOCKS)
|| defined(EXPERIMETAL_XCLIENT)
BOOL proxy_session = FALSE;
#endif
BOOL proxy_session = FALSE;
#endif
@@
-739,6
+737,7
@@
uid_t config_uid = CONFIGURE_OWNER;
uid_t config_uid = 0;
#endif
uid_t config_uid = 0;
#endif
+uint64_t connection_id = 0L;
int connection_max_messages= -1;
uschar *continue_proxy_cipher = NULL;
BOOL continue_proxy_dane = FALSE;
int connection_max_messages= -1;
uschar *continue_proxy_cipher = NULL;
BOOL continue_proxy_dane = FALSE;
@@
-997,11
+996,18
@@
uschar *host_lookup_msg = US"";
int host_number = 0;
uschar *host_number_string = NULL;
uschar *host_reject_connection = NULL;
int host_number = 0;
uschar *host_number_string = NULL;
uschar *host_reject_connection = NULL;
-tree_node *hostlist_anchor = NULL;
-int hostlist_count = 0;
+uschar *hosts_connection_nolog = NULL;
+#ifdef SUPPORT_PROXY
+uschar *hosts_proxy = NULL;
+#endif
uschar *hosts_treat_as_local = NULL;
uschar *hosts_require_helo = US"*";
uschar *hosts_treat_as_local = NULL;
uschar *hosts_require_helo = US"*";
-uschar *hosts_connection_nolog = NULL;
+#ifdef EXPERIMENTAL_XCLIENT
+uschar *hosts_xclient = NULL;
+#endif
+tree_node *hostlist_anchor = NULL;
+int hostlist_count = 0;
+
int ignore_bounce_errors_after = 10*7*24*60*60; /* 10 weeks */
uschar *ignore_fromline_hosts = NULL;
int ignore_bounce_errors_after = 10*7*24*60*60; /* 10 weeks */
uschar *ignore_fromline_hosts = NULL;
@@
-1084,6
+1090,7
@@
bit_table log_options[] = { /* must be in alphabetical order,
BIT_TABLE(L, all),
BIT_TABLE(L, all_parents),
BIT_TABLE(L, arguments),
BIT_TABLE(L, all),
BIT_TABLE(L, all_parents),
BIT_TABLE(L, arguments),
+ BIT_TABLE(L, connection_id),
BIT_TABLE(L, connection_reject),
BIT_TABLE(L, delay_delivery),
BIT_TABLE(L, deliver_time),
BIT_TABLE(L, connection_reject),
BIT_TABLE(L, delay_delivery),
BIT_TABLE(L, deliver_time),
@@
-1234,8
+1241,7
@@
int process_info_len = 0;
uschar *process_log_path = NULL;
const uschar *process_purpose = US"fresh-exec";
uschar *process_log_path = NULL;
const uschar *process_purpose = US"fresh-exec";
-#if defined(SUPPORT_PROXY) || defined(SUPPORT_SOCKS)
-uschar *hosts_proxy = NULL;
+#if defined(SUPPORT_PROXY) || defined(SUPPORT_SOCKS) || defined(EXPERIMENTAL_XCLIENT)
uschar *proxy_external_address = NULL;
int proxy_external_port = 0;
uschar *proxy_local_address = NULL;
uschar *proxy_external_address = NULL;
int proxy_external_port = 0;
uschar *proxy_local_address = NULL;
@@
-1248,6
+1254,8
@@
uschar *prvscheck_keynum = NULL;
uschar *prvscheck_result = NULL;
uschar *prvscheck_result = NULL;
+qrunner *qrunners = NULL;
+
const uschar *qualify_domain_recipient = NULL;
uschar *qualify_domain_sender = NULL;
uschar *queue_domains = NULL;
const uschar *qualify_domain_recipient = NULL;
uschar *qualify_domain_sender = NULL;
uschar *queue_domains = NULL;
@@
-1326,7
+1334,7
@@
const pcre2_code *regex_EARLY_PIPE = NULL;
int regex_cachesize = 0;
const pcre2_code *regex_ismsgid = NULL;
const pcre2_code *regex_smtp_code = NULL;
int regex_cachesize = 0;
const pcre2_code *regex_ismsgid = NULL;
const pcre2_code *regex_smtp_code = NULL;
-const uschar *regex_vars[REGEX_VARS] = {
0 };
;
+const uschar *regex_vars[REGEX_VARS] = {
NULL }
;
#ifdef WHITELIST_D_MACROS
const pcre2_code *regex_whitelisted_macro = NULL;
#endif
#ifdef WHITELIST_D_MACROS
const pcre2_code *regex_whitelisted_macro = NULL;
#endif
@@
-1657,8
+1665,7
@@
uschar *version_string = US"?";
uschar *warn_message_file = NULL;
int warning_count = 0;
uschar *warn_message_file = NULL;
int warning_count = 0;
-uschar *warnmsg_delay = NULL;
-uschar *warnmsg_recipients = NULL;
-
+const uschar *warnmsg_delay = NULL;
+const uschar *warnmsg_recipients = NULL;
/* End of globals.c */
/* End of globals.c */