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
(1) Don't ignore timeouts while writing to a pipe! (As opposed to
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index 7bef5792f6ed7e34db0c59c61c00bb79a57e8554..5fed1a144dcff6bb370241b5d799d94b28b50639 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/globals.c,v 1.
18 2005/03/01 10:21:44
ph10 Exp $ */
+/* $Cambridge: exim/src/src/globals.c,v 1.
23 2005/05/03 14:20:01
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-62,6
+62,10
@@
BOOL opt_perl_at_start = FALSE;
BOOL opt_perl_started = FALSE;
#endif
BOOL opt_perl_started = FALSE;
#endif
+#ifdef EXPAND_DLFUNC
+tree_node *dlobj_anchor = NULL;
+#endif
+
#ifdef LOOKUP_IBASE
uschar *ibase_servers = NULL;
#endif
#ifdef LOOKUP_IBASE
uschar *ibase_servers = NULL;
#endif
@@
-156,6
+160,9
@@
int address_expansions_count = sizeof(address_expansions)/sizeof(uschar **);
tree_node *acl_anchor = NULL;
uschar *acl_not_smtp = NULL;
tree_node *acl_anchor = NULL;
uschar *acl_not_smtp = NULL;
+#ifdef WITH_CONTENT_SCAN
+uschar *acl_not_smtp_mime = NULL;
+#endif
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;
@@
-184,9
+191,7
@@
error codes - keep in step with definitions of ACL_WHERE_xxxx in macros.h. */
uschar *acl_wherenames[] = { US"RCPT",
US"MAIL",
US"PREDATA",
uschar *acl_wherenames[] = { US"RCPT",
US"MAIL",
US"PREDATA",
-#ifdef WITH_CONTENT_SCAN
US"MIME",
US"MIME",
-#endif
US"DATA",
US"non-SMTP",
US"AUTH",
US"DATA",
US"non-SMTP",
US"AUTH",
@@
-203,9
+208,7
@@
uschar *acl_wherenames[] = { US"RCPT",
int acl_wherecodes[] = { 550, /* RCPT */
550, /* MAIL */
550, /* PREDATA */
int acl_wherecodes[] = { 550, /* RCPT */
550, /* MAIL */
550, /* PREDATA */
-#ifdef WITH_CONTENT_SCAN
550, /* MIME */
550, /* MIME */
-#endif
550, /* DATA */
0, /* not SMTP; not relevant */
503, /* AUTH */
550, /* DATA */
0, /* not SMTP; not relevant */
503, /* AUTH */
@@
-463,6
+466,12
@@
uschar *demime_reason = NULL;
#endif
BOOL disable_logging = FALSE;
#endif
BOOL disable_logging = FALSE;
+#ifdef EXPERIMENTAL_DOMAINKEYS
+uschar *dk_signing_domain = NULL;
+uschar *dk_signing_selector = NULL;
+int dk_do_verify = 0;
+#endif
+
uschar *dns_again_means_nonexist = NULL;
uschar *dns_ipv4_lookup = NULL;
int dns_retrans = 0;
uschar *dns_again_means_nonexist = NULL;
uschar *dns_ipv4_lookup = NULL;
int dns_retrans = 0;
@@
-1121,6
+1130,7
@@
transport_instance transport_defaults = {
int transport_count;
uschar **transport_filter_argv = NULL;
int transport_filter_timeout;
int transport_count;
uschar **transport_filter_argv = NULL;
int transport_filter_timeout;
+BOOL transport_filter_timed_out = FALSE;
int transport_write_timeout= 0;
tree_node *tree_dns_fails = NULL;
int transport_write_timeout= 0;
tree_node *tree_dns_fails = NULL;