projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix runtest -CONTINUE to work everywhere
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index 43cf73d5be2c35f3ddffba055abefe972ddb1324..a4898fe3f4c14b4f91c6e3dd2404d10a4ba93985 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-145,6
+145,12
@@
uschar *tls_verify_certificates= NULL;
uschar *tls_verify_hosts = NULL;
#endif
uschar *tls_verify_hosts = NULL;
#endif
+#ifdef EXPERIMENTAL_PRDR
+/* Per Recipient Data Response variables */
+BOOL prdr_enable = FALSE;
+BOOL prdr_requested = FALSE;
+const pcre *regex_PRDR = 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
/* 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
@@
-202,6
+208,9
@@
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;
+#ifdef EXPERIMENTAL_PRDR
+uschar *acl_smtp_data_prdr = NULL;
+#endif
#ifndef DISABLE_DKIM
uschar *acl_smtp_dkim = NULL;
#endif
#ifndef DISABLE_DKIM
uschar *acl_smtp_dkim = NULL;
#endif
@@
-235,6
+244,9
@@
uschar *acl_wherenames[] = { US"RCPT",
US"MIME",
US"DKIM",
US"DATA",
US"MIME",
US"DKIM",
US"DATA",
+#ifdef EXPERIMENTAL_PRDR
+ US"PRDR",
+#endif
US"non-SMTP",
US"AUTH",
US"connection",
US"non-SMTP",
US"AUTH",
US"connection",
@@
-257,6
+269,9
@@
uschar *acl_wherecodes[] = { US"550", /* RCPT */
US"550", /* MIME */
US"550", /* DKIM */
US"550", /* DATA */
US"550", /* MIME */
US"550", /* DKIM */
US"550", /* DATA */
+#ifdef EXPERIMENTAL_PRDR
+ US"550", /* RCPT PRDR */
+#endif
US"0", /* not SMTP; not relevant */
US"503", /* AUTH */
US"550", /* connect */
US"0", /* not SMTP; not relevant */
US"503", /* AUTH */
US"550", /* connect */
@@
-582,7
+597,7
@@
BOOL dns_csa_use_reverse = TRUE;
uschar *dns_ipv4_lookup = NULL;
int dns_retrans = 0;
int dns_retry = 0;
uschar *dns_ipv4_lookup = NULL;
int dns_retrans = 0;
int dns_retry = 0;
-int dns_
use_dnssec
= -1; /* <0 = not coerced */
+int dns_
dnssec_ok
= -1; /* <0 = not coerced */
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;