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
OpenSSL: unbreak build with older library version
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index 7e50867b2ecf502859c0191f92df82ef6534e9d3..574ee60a4819330614fd15f87ba9035aaa0e2a35 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-2,8
+2,8
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* All the global variables are defined together in this one module, so
/* See the file NOTICE for conditions of use and distribution. */
/* All the global variables are defined together in this one module, so
@@
-98,10
+98,6
@@
int sqlite_lock_timeout = 5;
BOOL move_frozen_messages = FALSE;
#endif
BOOL move_frozen_messages = FALSE;
#endif
-#ifdef ALLOW_INSECURE_TAINTED_DATA
-BOOL allow_insecure_tainted_data = FALSE;
-#endif
-
/* These variables are outside the #ifdef because it keeps the code less
cluttered in several places (e.g. during logging) if we can always refer to
them. Also, the tls_ variables are now always visible. Note that these are
/* These variables are outside the #ifdef because it keeps the code less
cluttered in several places (e.g. during logging) if we can always refer to
them. Also, the tls_ variables are now always visible. Note that these are
@@
-238,6
+234,7
@@
struct global_flags f =
.continue_more = FALSE,
.daemon_listen = FALSE,
.continue_more = FALSE,
.daemon_listen = FALSE,
+ .daemon_scion = FALSE,
.debug_daemon = FALSE,
.deliver_firsttime = FALSE,
.deliver_force = FALSE,
.debug_daemon = FALSE,
.deliver_firsttime = FALSE,
.deliver_force = FALSE,
@@
-395,7
+392,7
@@
BOOL proxy_session = FALSE;
#endif
#ifndef DISABLE_QUEUE_RAMP
#endif
#ifndef DISABLE_QUEUE_RAMP
-BOOL queue_fast_ramp =
FALS
E;
+BOOL queue_fast_ramp =
TRU
E;
#endif
BOOL queue_list_requires_admin = TRUE;
BOOL queue_only = FALSE;
#endif
BOOL queue_list_requires_admin = TRUE;
BOOL queue_only = FALSE;
@@
-654,6
+651,7
@@
auth_instance auth_defaults = {
uschar *auth_defer_msg = US"reason not recorded";
uschar *auth_defer_user_msg = US"";
const uschar *auth_vars[AUTH_VARS];
uschar *auth_defer_msg = US"reason not recorded";
uschar *auth_defer_user_msg = US"";
const uschar *auth_vars[AUTH_VARS];
+uschar *authenticator_name = NULL;
int auto_thaw = 0;
#ifdef WITH_CONTENT_SCAN
int av_failed = FALSE; /* boolean but accessed as vtype_int*/
int auto_thaw = 0;
#ifdef WITH_CONTENT_SCAN
int av_failed = FALSE; /* boolean but accessed as vtype_int*/
@@
-715,6
+713,9
@@
const pcre2_code *regex_LIMITS = NULL;
uschar *client_authenticator = NULL;
uschar *client_authenticated_id = NULL;
uschar *client_authenticated_sender = NULL;
uschar *client_authenticator = NULL;
uschar *client_authenticated_id = NULL;
uschar *client_authenticated_sender = NULL;
+#ifndef DISABLE_CLIENT_CMD_LOG
+gstring *client_cmd_log = NULL;
+#endif
int clmacro_count = 0;
uschar *clmacros[MAX_CLMACROS];
FILE *config_file = NULL;
int clmacro_count = 0;
uschar *clmacros[MAX_CLMACROS];
FILE *config_file = NULL;
@@
-814,10
+815,11
@@
bit_table debug_options[] = { /* must be in alphabetical order and use
BIT_TABLE(D, uid),
BIT_TABLE(D, verify),
};
BIT_TABLE(D, uid),
BIT_TABLE(D, verify),
};
-int debug_options_count = nelem(debug_options);
-unsigned debug_pretrigger_bsize= 0;
-uschar * debug_pretrigger_buf = NULL;
-unsigned int debug_selector = 0;
+int debug_options_count = nelem(debug_options);
+uschar debuglog_name[LOG_NAME_SIZE] = {0};
+unsigned debug_pretrigger_bsize = 0;
+uschar * debug_pretrigger_buf = NULL;
+unsigned int debug_selector = 0;
int delay_warning[DELAY_WARNING_SIZE] = { DELAY_WARNING_SIZE, 1, 24*60*60 };
uschar *delay_warning_condition=
int delay_warning[DELAY_WARNING_SIZE] = { DELAY_WARNING_SIZE, 1, 24*60*60 };
uschar *delay_warning_condition=
@@
-898,6
+900,8
@@
uschar *dnslist_text = NULL;
uschar *dnslist_value = NULL;
tree_node *domainlist_anchor = NULL;
int domainlist_count = 0;
uschar *dnslist_value = NULL;
tree_node *domainlist_anchor = NULL;
int domainlist_count = 0;
+const uschar *driver_srcfile = NULL;
+int driver_srcline = 0;
uschar *dsn_from = US DEFAULT_DSN_FROM;
unsigned int dtrigger_selector = 0;
uschar *dsn_from = US DEFAULT_DSN_FROM;
unsigned int dtrigger_selector = 0;
@@
-1012,6
+1016,10
@@
uschar *keep_environment = NULL;
int keep_malformed = 4*24*60*60; /* 4 days */
uschar *eldap_dn = NULL;
int keep_malformed = 4*24*60*60; /* 4 days */
uschar *eldap_dn = NULL;
+const uschar *letter_digit_hyphen_dot =
+ US"abcdefghijklmnopqrstuvwxyz"
+ ".-0123456789"
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
#ifdef EXPERIMENTAL_ESMTP_LIMITS
uschar *limits_advertise_hosts = US"*";
#endif
#ifdef EXPERIMENTAL_ESMTP_LIMITS
uschar *limits_advertise_hosts = US"*";
#endif
@@
-1055,9
+1063,6
@@
int log_default[] = { /* for initializing log_selector */
Li_size_reject,
Li_skip_delivery,
Li_smtp_confirmation,
Li_size_reject,
Li_skip_delivery,
Li_smtp_confirmation,
-#ifdef ALLOW_INSECURE_TAINTED_DATA
- Li_tainted,
-#endif
Li_tls_certificate_verified,
Li_tls_cipher,
-1
Li_tls_certificate_verified,
Li_tls_cipher,
-1
@@
-1127,9
+1132,6
@@
bit_table log_options[] = { /* must be in alphabetical order,
BIT_TABLE(L, smtp_protocol_error),
BIT_TABLE(L, smtp_syntax_error),
BIT_TABLE(L, subject),
BIT_TABLE(L, smtp_protocol_error),
BIT_TABLE(L, smtp_syntax_error),
BIT_TABLE(L, subject),
-#ifdef ALLOW_INSECURE_TAINTED_DATA
- BIT_TABLE(L, tainted),
-#endif
BIT_TABLE(L, tls_certificate_verified),
BIT_TABLE(L, tls_cipher),
BIT_TABLE(L, tls_peerdn),
BIT_TABLE(L, tls_certificate_verified),
BIT_TABLE(L, tls_cipher),
BIT_TABLE(L, tls_peerdn),
@@
-1210,9
+1212,12
@@
uid_t originator_uid;
uschar *override_local_interfaces = NULL;
uschar *override_pid_file_path = NULL;
uschar *override_local_interfaces = NULL;
uschar *override_pid_file_path = NULL;
+BOOL panic_coredump = FALSE;
pcre2_general_context * pcre_gen_ctx = NULL;
pcre2_general_context * pcre_gen_ctx = NULL;
-pcre2_compile_context * pcre_cmp_ctx = NULL;
-pcre2_match_context * pcre_mtc_ctx = NULL;
+pcre2_compile_context * pcre_gen_cmp_ctx = NULL;
+pcre2_match_context * pcre_gen_mtc_ctx = NULL;
+pcre2_general_context * pcre_mlc_ctx = NULL;
+pcre2_compile_context * pcre_mlc_cmp_ctx = NULL;
uschar *percent_hack_domains = NULL;
uschar *pid_file_path = US PID_FILE_PATH
uschar *percent_hack_domains = NULL;
uschar *pid_file_path = US PID_FILE_PATH
@@
-1316,6
+1321,7
@@
const pcre2_code *regex_SIZE = NULL;
#ifndef DISABLE_PIPE_CONNECT
const pcre2_code *regex_EARLY_PIPE = NULL;
#endif
#ifndef DISABLE_PIPE_CONNECT
const pcre2_code *regex_EARLY_PIPE = NULL;
#endif
+int regex_cachesize = 0;
const pcre2_code *regex_ismsgid = NULL;
const pcre2_code *regex_smtp_code = NULL;
const uschar *regex_vars[REGEX_VARS];
const pcre2_code *regex_ismsgid = NULL;
const pcre2_code *regex_smtp_code = NULL;
const uschar *regex_vars[REGEX_VARS];
@@
-1326,7
+1332,7
@@
const pcre2_code *regex_whitelisted_macro = NULL;
uschar *regex_match_string = NULL;
#endif
int remote_delivery_count = 0;
uschar *regex_match_string = NULL;
#endif
int remote_delivery_count = 0;
-int remote_max_parallel =
2
;
+int remote_max_parallel =
4
;
uschar *remote_sort_domains = NULL;
int retry_data_expire = 7*24*60*60;
int retry_interval_max = 24*60*60;
uschar *remote_sort_domains = NULL;
int retry_data_expire = 7*24*60*60;
int retry_interval_max = 24*60*60;
@@
-1642,7
+1648,7
@@
uschar *uucp_from_sender = US"$1";
uschar *verify_mode = NULL;
uschar *version_copyright =
US"Copyright (c) University of Cambridge, 1995 - 2018\n"
uschar *verify_mode = NULL;
uschar *version_copyright =
US"Copyright (c) University of Cambridge, 1995 - 2018\n"
- "(c) The Exim Maintainers and contributors in ACKNOWLEDGMENTS file, 2007 - 202
0
";
+ "(c) The Exim Maintainers and contributors in ACKNOWLEDGMENTS file, 2007 - 202
2
";
uschar *version_date = US"?";
uschar *version_cnumber = US"????";
uschar *version_string = US"?";
uschar *version_date = US"?";
uschar *version_cnumber = US"????";
uschar *version_string = US"?";