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. Update version.
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index 2324e40723a99f27581c95c18b44ea1a8fc903c3..b5b889accc684bf3682dbef543a74747f6633e21 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/globals.c,v 1.2
0 2005/03/22 14:11:54
ph10 Exp $ */
+/* $Cambridge: exim/src/src/globals.c,v 1.2
4 2005/05/10 10:19:11
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-160,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;
@@
-188,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",
@@
-207,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 */
@@
-386,6
+385,8
@@
BOOL continue_more = FALSE;
int continue_sequence = 1;
uschar *continue_transport = NULL;
int continue_sequence = 1;
uschar *continue_transport = NULL;
+uschar *csa_status = NULL;
+
BOOL daemon_listen = FALSE;
uschar *daemon_smtp_port = US"smtp";
BOOL debug_daemon = FALSE;
BOOL daemon_listen = FALSE;
uschar *daemon_smtp_port = US"smtp";
BOOL debug_daemon = FALSE;
@@
-474,6
+475,8
@@
int dk_do_verify = 0;
#endif
uschar *dns_again_means_nonexist = NULL;
#endif
uschar *dns_again_means_nonexist = NULL;
+int dns_csa_search_limit = 5;
+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;
@@
-1131,6
+1134,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;