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
Copyright updates:
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index c95d24b4743aadf90a3aa01497ce9870497ced5a..e94bef75ca182e51c506e2eeb17db96e0bf8de63 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
@@
-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;
@@
-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;
@@
-1016,6
+1024,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
@@
-1078,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),
@@
-1228,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;
@@
-1242,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;
@@
-1320,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];
+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
@@
-1587,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),
@@
-1651,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 */