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 df71025a3465c28e0f825782b4dc041b80aff6a5..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;
@@
-1033,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,
@@
-1075,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),