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
Do not close the (main)_log, if we do not see a chance to open it again.
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index e1837b67d5fcd8a92400e1d47356167083ec4561..9e68aaca81a065f0a178e9c63f5aad380fb894f2 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-98,6
+98,10
@@
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
@@
-994,6
+998,7
@@
uschar *host_reject_connection = NULL;
tree_node *hostlist_anchor = NULL;
int hostlist_count = 0;
uschar *hosts_treat_as_local = NULL;
tree_node *hostlist_anchor = NULL;
int hostlist_count = 0;
uschar *hosts_treat_as_local = NULL;
+uschar *hosts_require_helo = US"*";
uschar *hosts_connection_nolog = NULL;
int ignore_bounce_errors_after = 10*7*24*60*60; /* 10 weeks */
uschar *hosts_connection_nolog = NULL;
int ignore_bounce_errors_after = 10*7*24*60*60; /* 10 weeks */
@@
-1054,6
+1059,9
@@
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
@@
-1123,6
+1131,9
@@
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),
@@
-1471,6
+1482,7
@@
int smtp_accept_queue = 0;
int smtp_accept_queue_per_connection = 10;
int smtp_accept_reserve = 0;
uschar *smtp_active_hostname = NULL;
int smtp_accept_queue_per_connection = 10;
int smtp_accept_reserve = 0;
uschar *smtp_active_hostname = NULL;
+int smtp_backlog_monitor = 0;
uschar *smtp_banner = US"$smtp_active_hostname ESMTP "
"Exim $version_number $tod_full"
"\0<---------------Space to patch smtp_banner->";
uschar *smtp_banner = US"$smtp_active_hostname ESMTP "
"Exim $version_number $tod_full"
"\0<---------------Space to patch smtp_banner->";
@@
-1483,8
+1495,10
@@
int smtp_connect_backlog = 20;
double smtp_delay_mail = 0.0;
double smtp_delay_rcpt = 0.0;
FILE *smtp_in = NULL;
double smtp_delay_mail = 0.0;
double smtp_delay_rcpt = 0.0;
FILE *smtp_in = NULL;
+int smtp_listen_backlog = 0;
int smtp_load_reserve = -1;
int smtp_mailcmd_count = 0;
int smtp_load_reserve = -1;
int smtp_mailcmd_count = 0;
+int smtp_mailcmd_max = -1;
FILE *smtp_out = NULL;
uschar *smtp_etrn_command = NULL;
int smtp_max_synprot_errors= 3;
FILE *smtp_out = NULL;
uschar *smtp_etrn_command = NULL;
int smtp_max_synprot_errors= 3;