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
Revert introduction of alloc_insecure_tainted_data
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index 7f7ceac0085e581c854f0b5445badb38ae56437e..012c637dd98d6e6f33759548f812a4f301cadf99 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-98,10
+98,6
@@
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
@@
-815,8
+811,10
@@
bit_table debug_options[] = { /* must be in alphabetical order and use
BIT_TABLE(D, verify),
};
int debug_options_count = nelem(debug_options);
BIT_TABLE(D, verify),
};
int debug_options_count = nelem(debug_options);
-
+unsigned debug_pretrigger_bsize= 0;
+uschar * debug_pretrigger_buf = NULL;
unsigned int debug_selector = 0;
unsigned int debug_selector = 0;
+
int delay_warning[DELAY_WARNING_SIZE] = { DELAY_WARNING_SIZE, 1, 24*60*60 };
uschar *delay_warning_condition=
US"${if or {"
int delay_warning[DELAY_WARNING_SIZE] = { DELAY_WARNING_SIZE, 1, 24*60*60 };
uschar *delay_warning_condition=
US"${if or {"
@@
-897,6
+895,7
@@
uschar *dnslist_value = NULL;
tree_node *domainlist_anchor = NULL;
int domainlist_count = 0;
uschar *dsn_from = US DEFAULT_DSN_FROM;
tree_node *domainlist_anchor = NULL;
int domainlist_count = 0;
uschar *dsn_from = US DEFAULT_DSN_FROM;
+unsigned int dtrigger_selector = 0;
int errno_quota = ERRNO_QUOTA;
uschar *errors_copy = NULL;
int errno_quota = ERRNO_QUOTA;
uschar *errors_copy = NULL;
@@
-1052,9
+1051,6
@@
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
@@
-1124,9
+1120,6
@@
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),