projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Retire EXPERIMENTAL_REQUIRETLS
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index fdeaebd642104eb65fa3c129b340a957d763da2c..f52ae92cec76ffe32f11fdbbad5ab51f434bd830 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-161,11
+161,6
@@
uschar *tls_ocsp_file = NULL;
uschar *tls_privatekey = NULL;
BOOL tls_remember_esmtp = FALSE;
uschar *tls_require_ciphers = NULL;
uschar *tls_privatekey = NULL;
BOOL tls_remember_esmtp = FALSE;
uschar *tls_require_ciphers = NULL;
-# ifdef EXPERIMENTAL_REQUIRETLS
-uschar tls_requiretls = 0; /* REQUIRETLS_MSG etc. bit #defines */
-uschar *tls_advertise_requiretls = US"*";
-const pcre *regex_REQUIRETLS = NULL;
-# endif
uschar *tls_try_verify_hosts = NULL;
uschar *tls_verify_certificates= US"system";
uschar *tls_verify_hosts = NULL;
uschar *tls_try_verify_hosts = NULL;
uschar *tls_verify_certificates= US"system";
uschar *tls_verify_hosts = NULL;
@@
-325,6
+320,11
@@
struct global_flags f =
.sender_name_forced = FALSE,
.sender_set_untrusted = FALSE,
.smtp_authenticated = FALSE,
.sender_name_forced = FALSE,
.sender_set_untrusted = FALSE,
.smtp_authenticated = FALSE,
+#ifdef EXPERIMENTAL_PIPE_CONNECT
+ .smtp_in_early_pipe_advertised = FALSE,
+ .smtp_in_early_pipe_no_auth = FALSE,
+ .smtp_in_early_pipe_used = FALSE,
+#endif
.smtp_in_pipelining_advertised = FALSE,
.smtp_in_pipelining_used = FALSE,
.spool_file_wireformat = FALSE,
.smtp_in_pipelining_advertised = FALSE,
.smtp_in_pipelining_used = FALSE,
.spool_file_wireformat = FALSE,
@@
-336,6
+336,7
@@
struct global_flags f =
.tcp_fastopen_ok = FALSE,
.tcp_in_fastopen = FALSE,
.tcp_fastopen_ok = FALSE,
.tcp_in_fastopen = FALSE,
+ .tcp_in_fastopen_data = FALSE,
.tcp_in_fastopen_logged = FALSE,
.tcp_out_fastopen_logged= FALSE,
.timestamps_utc = FALSE,
.tcp_in_fastopen_logged = FALSE,
.tcp_out_fastopen_logged= FALSE,
.timestamps_utc = FALSE,
@@
-704,9
+705,9
@@
int callout_cache_negative_expire = 2*60*60;
uschar *callout_random_local_part = US"$primary_hostname-$tod_epoch-testing";
uschar *check_dns_names_pattern= US"(?i)^(?>(?(1)\\.|())[^\\W](?>[a-z0-9/_-]*[^\\W])?)+(\\.?)$";
int check_log_inodes = 100;
uschar *callout_random_local_part = US"$primary_hostname-$tod_epoch-testing";
uschar *check_dns_names_pattern= US"(?i)^(?>(?(1)\\.|())[^\\W](?>[a-z0-9/_-]*[^\\W])?)+(\\.?)$";
int check_log_inodes = 100;
-int
check_log_space = 10*1024;
/* 10K Kbyte == 10MB */
+int
_eximarith_t check_log_space = 10*1024;
/* 10K Kbyte == 10MB */
int check_spool_inodes = 100;
int check_spool_inodes = 100;
-int
check_spool_space = 10*1024;
/* 10K Kbyte == 10MB */
+int
_eximarith_t check_spool_space = 10*1024;
/* 10K Kbyte == 10MB */
uschar *chunking_advertise_hosts = US"*";
unsigned chunking_datasize = 0;
uschar *chunking_advertise_hosts = US"*";
unsigned chunking_datasize = 0;
@@
-1027,6
+1028,7
@@
int log_default[] = { /* for initializing log_selector */
Li_host_lookup_failed,
Li_lost_incoming_connection,
Li_outgoing_interface, /* see d_log_interface in deliver.c */
Li_host_lookup_failed,
Li_lost_incoming_connection,
Li_outgoing_interface, /* see d_log_interface in deliver.c */
+ Li_msg_id,
Li_queue_run,
Li_rejected_header,
Li_retry_defer,
Li_queue_run,
Li_rejected_header,
Li_retry_defer,
@@
-1069,6
+1071,8
@@
bit_table log_options[] = { /* must be in alphabetical order */
BIT_TABLE(L, incoming_port),
BIT_TABLE(L, lost_incoming_connection),
BIT_TABLE(L, millisec),
BIT_TABLE(L, incoming_port),
BIT_TABLE(L, lost_incoming_connection),
BIT_TABLE(L, millisec),
+ BIT_TABLE(L, msg_id),
+ BIT_TABLE(L, msg_id_created),
BIT_TABLE(L, outgoing_interface),
BIT_TABLE(L, outgoing_port),
BIT_TABLE(L, pid),
BIT_TABLE(L, outgoing_interface),
BIT_TABLE(L, outgoing_port),
BIT_TABLE(L, pid),
@@
-1180,6
+1184,9
@@
uschar *override_pid_file_path = NULL;
uschar *percent_hack_domains = NULL;
uschar *pid_file_path = US PID_FILE_PATH
"\0<--------------Space to patch pid_file_path->";
uschar *percent_hack_domains = NULL;
uschar *pid_file_path = US PID_FILE_PATH
"\0<--------------Space to patch pid_file_path->";
+#ifdef EXPERIMENTAL_PIPE_CONNECT
+uschar *pipe_connect_advertise_hosts = US"*";
+#endif
uschar *pipelining_advertise_hosts = US"*";
uschar *primary_hostname = NULL;
uschar process_info[PROCESS_INFO_SIZE];
uschar *pipelining_advertise_hosts = US"*";
uschar *primary_hostname = NULL;
uschar process_info[PROCESS_INFO_SIZE];
@@
-1211,7
+1218,7
@@
pid_t queue_run_pid = (pid_t)0;
int queue_run_pipe = -1;
uschar *queue_smtp_domains = NULL;
int queue_run_pipe = -1;
uschar *queue_smtp_domains = NULL;
-u
nsigned int random_seed
= 0;
+u
int32_t random_seed
= 0;
tree_node *ratelimiters_cmd = NULL;
tree_node *ratelimiters_conn = NULL;
tree_node *ratelimiters_mail = NULL;
tree_node *ratelimiters_cmd = NULL;
tree_node *ratelimiters_conn = NULL;
tree_node *ratelimiters_mail = NULL;
@@
-1237,13
+1244,13
@@
date will be automatically added on the end. */
uschar *received_header_text = US
"Received: "
"${if def:sender_rcvhost {from $sender_rcvhost\n\t}"
uschar *received_header_text = US
"Received: "
"${if def:sender_rcvhost {from $sender_rcvhost\n\t}"
- "{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}"
- "${if def:sender_helo_name {(helo=$sender_helo_name)\n\t}}}}"
+
"{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}"
+
"${if def:sender_helo_name {(helo=$sender_helo_name)\n\t}}}}"
"by $primary_hostname "
"by $primary_hostname "
- "${if def:received_protocol {with $received_protocol
}}
"
-
#ifdef SUPPORT_TLS
- "${if def:tls_
cipher {($tls_cipher)
\n\t}}"
-
#endif
+ "${if def:received_protocol {with $received_protocol
}}
"
+#ifdef SUPPORT_TLS
+ "${if def:tls_
in_cipher_std { tls $tls_in_cipher_std
\n\t}}"
+#endif
"(Exim $version_number)\n\t"
"${if def:sender_address {(envelope-from <$sender_address>)\n\t}}"
"id $message_exim_id"
"(Exim $version_number)\n\t"
"${if def:sender_address {(envelope-from <$sender_address>)\n\t}}"
"id $message_exim_id"
@@
-1267,6
+1274,9
@@
const pcre *regex_From = NULL;
const pcre *regex_IGNOREQUOTA = NULL;
const pcre *regex_PIPELINING = NULL;
const pcre *regex_SIZE = NULL;
const pcre *regex_IGNOREQUOTA = NULL;
const pcre *regex_PIPELINING = NULL;
const pcre *regex_SIZE = NULL;
+#ifdef EXPERIMENTAL_PIPE_CONNECT
+const pcre *regex_EARLY_PIPE = NULL;
+#endif
const pcre *regex_ismsgid = NULL;
const pcre *regex_smtp_code = NULL;
uschar *regex_vars[REGEX_VARS];
const pcre *regex_ismsgid = NULL;
const pcre *regex_smtp_code = NULL;
uschar *regex_vars[REGEX_VARS];
@@
-1417,6
+1427,7
@@
int sender_verified_rc = -1;
uschar *sending_ip_address = NULL;
int sending_port = -1;
SIGNAL_BOOL sigalrm_seen = FALSE;
uschar *sending_ip_address = NULL;
int sending_port = -1;
SIGNAL_BOOL sigalrm_seen = FALSE;
+const uschar *sigalarm_setter = NULL;
uschar **sighup_argv = NULL;
int slow_lookup_log = 0; /* millisecs, zero disables */
int smtp_accept_count = 0;
uschar **sighup_argv = NULL;
int slow_lookup_log = 0; /* millisecs, zero disables */
int smtp_accept_count = 0;