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
Fix CVE-2016-1531
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index cb93a019288801760ead6154477b358023c7938b..1dbc015f0a1ab27d7572fd97d3994c0d7f767149 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 201
4
*/
+/* Copyright (c) University of Cambridge 1995 - 201
5
*/
/* See the file NOTICE for conditions of use and distribution. */
/* All the global variables are defined together in this one module, so
/* See the file NOTICE for conditions of use and distribution. */
/* All the global variables are defined together in this one module, so
@@
-156,6
+156,7
@@
that's the interop problem which has been observed: GnuTLS suggesting a higher
bit-count as "NORMAL" (2432) and Thunderbird dropping connection. */
int tls_dh_max_bits = 2236;
uschar *tls_dhparam = NULL;
bit-count as "NORMAL" (2432) and Thunderbird dropping connection. */
int tls_dh_max_bits = 2236;
uschar *tls_dhparam = NULL;
+uschar *tls_eccurve = US"prime256v1";
#ifndef DISABLE_OCSP
uschar *tls_ocsp_file = NULL;
#endif
#ifndef DISABLE_OCSP
uschar *tls_ocsp_file = NULL;
#endif
@@
-175,6
+176,10
@@
BOOL prdr_requested = FALSE;
const pcre *regex_PRDR = NULL;
#endif
const pcre *regex_PRDR = NULL;
#endif
+#ifdef EXPERIMENTAL_INTERNATIONAL
+const pcre *regex_UTF8 = NULL;
+#endif
+
/* Input-reading functions for messages, so we can use special ones for
incoming TCP/IP. The defaults use stdin. We never need these for any
stand-alone tests. */
/* Input-reading functions for messages, so we can use special ones for
incoming TCP/IP. The defaults use stdin. We never need these for any
stand-alone tests. */
@@
-315,6
+320,7
@@
BOOL active_local_from_check = FALSE;
BOOL active_local_sender_retain = FALSE;
int body_8bitmime = 0;
BOOL accept_8bitmime = TRUE; /* deliberately not RFC compliant */
BOOL active_local_sender_retain = FALSE;
int body_8bitmime = 0;
BOOL accept_8bitmime = TRUE; /* deliberately not RFC compliant */
+uschar *add_environment = NULL;
address_item *addr_duplicate = NULL;
address_item address_defaults = {
address_item *addr_duplicate = NULL;
address_item address_defaults = {
@@
-383,6
+389,9
@@
address_item address_defaults = {
NULL, /* remove_headers */
#ifdef EXPERIMENTAL_SRS
NULL, /* srs_sender */
NULL, /* remove_headers */
#ifdef EXPERIMENTAL_SRS
NULL, /* srs_sender */
+#endif
+#ifdef EXPERIMENTAL_INTERNATIONAL
+ FALSE, /* utf8 */
#endif
}
};
#endif
}
};
@@
-649,6
+658,7
@@
uschar *dns_ipv4_lookup = NULL;
int dns_retrans = 0;
int dns_retry = 0;
int dns_dnssec_ok = -1; /* <0 = not coerced */
int dns_retrans = 0;
int dns_retry = 0;
int dns_dnssec_ok = -1; /* <0 = not coerced */
+uschar *dns_trust_aa = NULL;
int dns_use_edns0 = -1; /* <0 = not coerced */
uschar *dnslist_domain = NULL;
uschar *dnslist_matched = NULL;
int dns_use_edns0 = -1; /* <0 = not coerced */
uschar *dnslist_domain = NULL;
uschar *dnslist_matched = NULL;
@@
-780,6
+790,8
@@
uschar *iterate_item = NULL;
int journal_fd = -1;
int journal_fd = -1;
+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;
@@
-908,6
+920,7
@@
int message_size = 0;
uschar *message_size_limit = US"50M";
#ifdef EXPERIMENTAL_INTERNATIONAL
BOOL message_smtputf8 = FALSE;
uschar *message_size_limit = US"50M";
#ifdef EXPERIMENTAL_INTERNATIONAL
BOOL message_smtputf8 = FALSE;
+int message_utf8_downconvert = 0; /* -1 ifneeded; 0 never; 1 always */
#endif
uschar message_subdir[2] = { 0, 0 };
uschar *message_reference = NULL;
#endif
uschar message_subdir[2] = { 0, 0 };
uschar *message_reference = NULL;
@@
-1160,7
+1173,9
@@
router_instance router_defaults = {
NULL, /* fallback_hostlist */
NULL, /* transport instance */
NULL, /* pass_router */
NULL, /* fallback_hostlist */
NULL, /* transport instance */
NULL, /* pass_router */
- NULL /* redirect_router */
+ NULL, /* redirect_router */
+
+ { NULL, NULL }, /* dnssec_domains {require,request} */
};
uschar *router_name = NULL;
};
uschar *router_name = NULL;
@@
-1191,6
+1206,7
@@
uschar *sender_address_unrewritten = NULL;
uschar *sender_data = NULL;
unsigned int sender_domain_cache[(MAX_NAMED_LIST * 2)/32];
uschar *sender_fullhost = NULL;
uschar *sender_data = NULL;
unsigned int sender_domain_cache[(MAX_NAMED_LIST * 2)/32];
uschar *sender_fullhost = NULL;
+BOOL sender_helo_dnssec = FALSE;
uschar *sender_helo_name = NULL;
uschar **sender_host_aliases = &no_aliases;
uschar *sender_host_address = NULL;
uschar *sender_helo_name = NULL;
uschar **sender_host_aliases = &no_aliases;
uschar *sender_host_address = NULL;
@@
-1219,6
+1235,7
@@
uschar *sending_ip_address = NULL;
int sending_port = -1;
SIGNAL_BOOL sigalrm_seen = FALSE;
uschar **sighup_argv = NULL;
int sending_port = -1;
SIGNAL_BOOL sigalrm_seen = FALSE;
uschar **sighup_argv = NULL;
+int slow_lookup_log = 0; /* millisecs, zero disables */
int smtp_accept_count = 0;
BOOL smtp_accept_keepalive = TRUE;
int smtp_accept_max = 20;
int smtp_accept_count = 0;
BOOL smtp_accept_keepalive = TRUE;
int smtp_accept_max = 20;
@@
-1274,7
+1291,7
@@
int smtp_rlr_threshold = INT_MAX;
BOOL smtp_use_pipelining = FALSE;
BOOL smtp_use_size = FALSE;
#ifdef EXPERIMENTAL_INTERNATIONAL
BOOL smtp_use_pipelining = FALSE;
BOOL smtp_use_size = FALSE;
#ifdef EXPERIMENTAL_INTERNATIONAL
-uschar *smtputf8_advertise_hosts = US"*";
+uschar *smtputf8_advertise_hosts = US"*";
/* overridden under test-harness */
#endif
#ifdef WITH_CONTENT_SCAN
#endif
#ifdef WITH_CONTENT_SCAN
@@
-1457,8
+1474,8
@@
uschar *uucp_from_sender = US"$1";
uschar *verify_mode = NULL;
uschar *version_copyright =
uschar *verify_mode = NULL;
uschar *version_copyright =
- US"Copyright (c) University of Cambridge, 1995 - 201
4
\n"
- "(c) The Exim Maintainers and contributors in ACKNOWLEDGMENTS file, 2007 - 201
4
";
+ US"Copyright (c) University of Cambridge, 1995 - 201
5
\n"
+ "(c) The Exim Maintainers and contributors in ACKNOWLEDGMENTS file, 2007 - 201
5
";
uschar *version_date = US"?";
uschar *version_cnumber = US"????";
uschar *version_string = US"?";
uschar *version_date = US"?";
uschar *version_cnumber = US"????";
uschar *version_string = US"?";