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
RFC3461 support - MIME DSN messages. Bug 118
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index a25b06a05cc3f48bd8b66813c8594b270ea854a1..f8166aadfd12bd4cd2e7967298c76e668d49fa2e 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-126,6
+126,13
@@
tls_support tls_out = {
0 /* tls_ocsp */
};
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;
@@
-346,6
+353,11
@@
address_item address_defaults = {
NULL, /* authenticator */
NULL, /* auth_id */
NULL, /* auth_sndr */
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 */
@@
-1117,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 */