git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Safer coding for utf8clean expansion operator
[users/heiko/exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index fbc3787f92d0a138fd28102e67f982b62fcbf7a7..d3f99877c20ee1ff051ca02e926bd9eb0753893f 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-106,8
+106,11
@@
tls_support tls_in = {
NULL, /* tls_cipher */
FALSE,/* tls_on_connect */
NULL, /* tls_on_connect_ports */
NULL, /* tls_cipher */
FALSE,/* tls_on_connect */
NULL, /* tls_on_connect_ports */
+ NULL, /* tls_ourcert */
+ NULL, /* tls_peercert */
NULL, /* tls_peerdn */
NULL, /* tls_peerdn */
- NULL /* tls_sni */
+ NULL, /* tls_sni */
+ 0 /* tls_ocsp */
};
tls_support tls_out = {
-1, /* tls_active */
};
tls_support tls_out = {
-1, /* tls_active */
@@
-116,10
+119,20
@@
tls_support tls_out = {
NULL, /* tls_cipher */
FALSE,/* tls_on_connect */
NULL, /* tls_on_connect_ports */
NULL, /* tls_cipher */
FALSE,/* tls_on_connect */
NULL, /* tls_on_connect_ports */
+ NULL, /* tls_ourcert */
+ NULL, /* tls_peercert */
NULL, /* tls_peerdn */
NULL, /* tls_peerdn */
- NULL /* tls_sni */
+ NULL, /* tls_sni */
+ 0 /* tls_ocsp */
};
};
+#ifdef EXPERIMENTAL_DSN
+uschar *dsn_envid = NULL;
+int dsn_ret = 0;
+const pcre *regex_DSN = NULL;
+BOOL smtp_use_dsn = FALSE;
+uschar *dsn_advertise_hosts = NULL;
+#endif
#ifdef SUPPORT_TLS
BOOL gnutls_compat_mode = FALSE;
#ifdef SUPPORT_TLS
BOOL gnutls_compat_mode = FALSE;
@@
-137,7
+150,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;
-#if
defined(EXPERIMENTAL_OCSP) && !defined(USE_GNUTLS)
+#if
ndef DISABLE_OCSP
uschar *tls_ocsp_file = NULL;
#endif
BOOL tls_offered = FALSE;
uschar *tls_ocsp_file = NULL;
#endif
BOOL tls_offered = FALSE;
@@
-149,7
+162,7
@@
uschar *tls_verify_certificates= NULL;
uschar *tls_verify_hosts = NULL;
#endif
uschar *tls_verify_hosts = NULL;
#endif
-#if
def EXPERIMENTAL
_PRDR
+#if
ndef DISABLE
_PRDR
/* Per Recipient Data Response variables */
BOOL prdr_enable = FALSE;
BOOL prdr_requested = FALSE;
/* Per Recipient Data Response variables */
BOOL prdr_enable = FALSE;
BOOL prdr_requested = FALSE;
@@
-212,7
+225,7
@@
uschar *acl_removed_headers = NULL;
uschar *acl_smtp_auth = NULL;
uschar *acl_smtp_connect = NULL;
uschar *acl_smtp_data = NULL;
uschar *acl_smtp_auth = NULL;
uschar *acl_smtp_connect = NULL;
uschar *acl_smtp_data = NULL;
-#if
def EXPERIMENTAL
_PRDR
+#if
ndef DISABLE
_PRDR
uschar *acl_smtp_data_prdr = NULL;
#endif
#ifndef DISABLE_DKIM
uschar *acl_smtp_data_prdr = NULL;
#endif
#ifndef DISABLE_DKIM
@@
-248,7
+261,7
@@
uschar *acl_wherenames[] = { US"RCPT",
US"MIME",
US"DKIM",
US"DATA",
US"MIME",
US"DKIM",
US"DATA",
-#if
def EXPERIMENTAL
_PRDR
+#if
ndef DISABLE
_PRDR
US"PRDR",
#endif
US"non-SMTP",
US"PRDR",
#endif
US"non-SMTP",
@@
-273,7
+286,7
@@
uschar *acl_wherecodes[] = { US"550", /* RCPT */
US"550", /* MIME */
US"550", /* DKIM */
US"550", /* DATA */
US"550", /* MIME */
US"550", /* DKIM */
US"550", /* DATA */
-#if
def EXPERIMENTAL
_PRDR
+#if
ndef DISABLE
_PRDR
US"550", /* RCPT PRDR */
#endif
US"0", /* not SMTP; not relevant */
US"550", /* RCPT PRDR */
#endif
US"0", /* not SMTP; not relevant */
@@
-332,11
+345,19
@@
address_item address_defaults = {
NULL, /* shadow_message */
#ifdef SUPPORT_TLS
NULL, /* cipher */
NULL, /* shadow_message */
#ifdef SUPPORT_TLS
NULL, /* cipher */
+ NULL, /* ourcert */
+ NULL, /* peercert */
NULL, /* peerdn */
NULL, /* peerdn */
+ OCSP_NOT_REQ, /* ocsp */
#endif
NULL, /* authenticator */
NULL, /* auth_id */
NULL, /* auth_sndr */
#endif
NULL, /* authenticator */
NULL, /* auth_id */
NULL, /* auth_sndr */
+ #ifdef EXPERIMENTAL_DSN
+ NULL, /* dsn_orcpt */
+ 0, /* dsn_flags */
+ 0, /* dsn_aware */
+ #endif
(uid_t)(-1), /* uid */
(gid_t)(-1), /* gid */
0, /* flags */
(uid_t)(-1), /* uid */
(gid_t)(-1), /* gid */
0, /* flags */
@@
-552,7
+573,7
@@
BOOL deliver_drop_privilege = FALSE;
BOOL deliver_firsttime = FALSE;
BOOL deliver_force = FALSE;
BOOL deliver_freeze = FALSE;
BOOL deliver_firsttime = FALSE;
BOOL deliver_force = FALSE;
BOOL deliver_freeze = FALSE;
-
int
deliver_frozen_at = 0;
+
time_t
deliver_frozen_at = 0;
uschar *deliver_home = NULL;
uschar *deliver_host = NULL;
uschar *deliver_host_address = NULL;
uschar *deliver_home = NULL;
uschar *deliver_host = NULL;
uschar *deliver_host_address = NULL;
@@
-837,6
+858,7
@@
BOOL log_testing_mode = FALSE;
BOOL log_timezone = FALSE;
unsigned int log_write_selector= L_default;
uschar *login_sender_address = NULL;
BOOL log_timezone = FALSE;
unsigned int log_write_selector= L_default;
uschar *login_sender_address = NULL;
+uschar *lookup_dnssec_authenticated = NULL;
int lookup_open_max = 25;
uschar *lookup_value = NULL;
int lookup_open_max = 25;
uschar *lookup_value = NULL;
@@
-1107,6
+1129,9
@@
router_instance router_defaults = {
TRUE, /* verify_sender */
FALSE, /* uid_set */
FALSE, /* unseen */
TRUE, /* verify_sender */
FALSE, /* uid_set */
FALSE, /* unseen */
+#ifdef EXPERIMENTAL_DSN
+ FALSE, /* dsn_lasthop */
+#endif
self_freeze, /* self_code */
(uid_t)(-1), /* uid */
self_freeze, /* self_code */
(uid_t)(-1), /* uid */
@@
-1362,6
+1387,9
@@
transport_instance transport_defaults = {
FALSE, /* log_defer_output */
TRUE_UNSET /* retry_use_local_part: BOOL, but set neither
1 nor 0 so can detect unset */
FALSE, /* log_defer_output */
TRUE_UNSET /* retry_use_local_part: BOOL, but set neither
1 nor 0 so can detect unset */
+#ifdef EXPERIMENTAL_TPDA
+ ,NULL /* tpda_delivery_action */
+#endif
};
int transport_count;
};
int transport_count;