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
constification
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index cafb1599229de9eae20615c5ffcb7b4e122d9ec2..46ca72f20fe7d6bd8633bc5153b0872e75adf2fe 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-2,9
+2,10
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) The Exim Maintainers 2020 - 202
2
*/
+/* Copyright (c) The Exim Maintainers 2020 - 202
3
*/
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/* All the global variables are defined together in this one module, so
that they are easy to find. */
/* All the global variables are defined together in this one module, so
that they are easy to find. */
@@
-279,6
+280,7
@@
struct global_flags f =
.no_mbox_unspool = FALSE,
#endif
.no_multiline_responses = FALSE,
.no_mbox_unspool = FALSE,
#endif
.no_multiline_responses = FALSE,
+ .notifier_socket_en = TRUE,
.parse_allow_group = FALSE,
.parse_found_group = FALSE,
.parse_allow_group = FALSE,
.parse_found_group = FALSE,
@@
-289,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,
@@
-387,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
@@
-726,7
+726,7
@@
gid_t config_gid = CONFIGURE_GROUP;
#else
gid_t config_gid = 0;
#endif
#else
gid_t config_gid = 0;
#endif
-
uschar *config_main_filelist
= US CONFIGURE_FILE
+
const uschar * config_main_filelist
= US CONFIGURE_FILE
"\0<-----------Space to patch configure_filename->";
uschar *config_main_filename = NULL;
uschar *config_main_directory = NULL;
"\0<-----------Space to patch configure_filename->";
uschar *config_main_filename = NULL;
uschar *config_main_directory = NULL;
@@
-737,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;
@@
-938,8
+939,8
@@
uschar *fake_response_text = US"Your message has been rejected but is "
int filter_n[FILTER_VARIABLE_COUNT];
int filter_sn[FILTER_VARIABLE_COUNT];
int filter_test = FTEST_NONE;
int filter_n[FILTER_VARIABLE_COUNT];
int filter_sn[FILTER_VARIABLE_COUNT];
int filter_test = FTEST_NONE;
-
uschar *filter_test_sfile
= NULL;
-
uschar *filter_test_ufile
= NULL;
+
const uschar * filter_test_sfile
= NULL;
+
const uschar * filter_test_ufile
= NULL;
uschar *filter_thisaddress = NULL;
int finduser_retries = 0;
uid_t fixed_never_users[] = { FIXED_NEVER_USERS };
uschar *filter_thisaddress = NULL;
int finduser_retries = 0;
uid_t fixed_never_users[] = { FIXED_NEVER_USERS };
@@
-995,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;
@@
-1082,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),
@@
-1176,7
+1185,7
@@
uschar *message_size_limit = US"50M";
int message_utf8_downconvert = 0; /* -1 ifneeded; 0 never; 1 always */
#endif
uschar message_subdir[2] = { 0, 0 };
int message_utf8_downconvert = 0; /* -1 ifneeded; 0 never; 1 always */
#endif
uschar message_subdir[2] = { 0, 0 };
-
uschar *message_reference
= NULL;
+
const uschar *message_reference
= NULL;
/* MIME ACL expandables */
#ifdef WITH_CONTENT_SCAN
/* MIME ACL expandables */
#ifdef WITH_CONTENT_SCAN
@@
-1210,7
+1219,7
@@
uschar *originator_login = NULL;
uschar *originator_name = NULL;
uid_t originator_uid;
uschar *override_local_interfaces = NULL;
uschar *originator_name = NULL;
uid_t originator_uid;
uschar *override_local_interfaces = NULL;
-uschar *override_pid_file_path = NULL;
+
const
uschar *override_pid_file_path = NULL;
BOOL panic_coredump = FALSE;
pcre2_general_context * pcre_gen_ctx = NULL;
BOOL panic_coredump = FALSE;
pcre2_general_context * pcre_gen_ctx = NULL;
@@
-1220,7
+1229,7
@@
pcre2_general_context * pcre_mlc_ctx = NULL;
pcre2_compile_context * pcre_mlc_cmp_ctx = NULL;
uschar *percent_hack_domains = NULL;
pcre2_compile_context * pcre_mlc_cmp_ctx = NULL;
uschar *percent_hack_domains = NULL;
-
uschar *pid_file_path
= US PID_FILE_PATH
+
const uschar *pid_file_path
= US PID_FILE_PATH
"\0<--------------Space to patch pid_file_path->";
#ifndef DISABLE_PIPE_CONNECT
uschar *pipe_connect_advertise_hosts = US"*";
"\0<--------------Space to patch pid_file_path->";
#ifndef DISABLE_PIPE_CONNECT
uschar *pipe_connect_advertise_hosts = US"*";
@@
-1232,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;
@@
-1246,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;
@@
-1324,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
@@
-1475,7
+1485,7
@@
uschar *sending_ip_address = NULL;
int sending_port = -1;
SIGNAL_BOOL sigalrm_seen = FALSE;
const uschar *sigalarm_setter = NULL;
int sending_port = -1;
SIGNAL_BOOL sigalrm_seen = FALSE;
const uschar *sigalarm_setter = NULL;
-
uschar **sighup_argv
= NULL;
+
const uschar **sighup_argv
= NULL;
int slow_lookup_log = 0; /* millisecs, zero disables */
int smtp_accept_count = 0;
int smtp_accept_max = 20;
int slow_lookup_log = 0; /* millisecs, zero disables */
int smtp_accept_count = 0;
int smtp_accept_max = 20;
@@
-1562,7
+1572,7
@@
int string_datestamp_type = -1;
const uschar *submission_domain = NULL;
const uschar *submission_name = NULL;
int syslog_facility = LOG_MAIL;
const uschar *submission_domain = NULL;
const uschar *submission_name = NULL;
int syslog_facility = LOG_MAIL;
-
uschar *syslog_processname
= US"exim";
+
const uschar *syslog_processname
= US"exim";
uschar *system_filter = NULL;
uschar *system_filter_directory_transport = NULL;
uschar *system_filter = NULL;
uschar *system_filter_directory_transport = NULL;
@@
-1591,7
+1601,7
@@
transport_instance transport_defaults = {
/* All non-mentioned elements zero/NULL/FALSE */
.batch_max = 1,
.multi_domain = TRUE,
/* All non-mentioned elements zero/NULL/FALSE */
.batch_max = 1,
.multi_domain = TRUE,
- .max_addresses =
100
,
+ .max_addresses =
US"100"
,
.connection_max_messages = 500,
.uid = (uid_t)(-1),
.gid = (gid_t)(-1),
.connection_max_messages = 500,
.uid = (uid_t)(-1),
.gid = (gid_t)(-1),
@@
-1655,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 */