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 8184758c8a00a4dc4d7ff74b84414209f9fd2892..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.
14 2005/01/12 14:41:12
ph10 Exp $ */
+/* $Cambridge: exim/src/src/globals.c,v 1.
24 2005/05/10 10:19:11
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 */
@@
-218,7
+221,7
@@
int acl_wherecodes[] = { 550, /* RCPT */
550, /* STARTTLS */
252 /* VRFY */
};
550, /* STARTTLS */
252 /* VRFY */
};
-
+
BOOL active_local_from_check = FALSE;
BOOL active_local_sender_retain = FALSE;
BOOL accept_8bitmime = FALSE;
BOOL active_local_from_check = FALSE;
BOOL active_local_sender_retain = FALSE;
BOOL accept_8bitmime = FALSE;
@@
-382,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;
@@
-463,7
+468,15
@@
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_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;
@@
-559,6
+572,7
@@
BOOL host_checking_callout = FALSE;
uschar *host_data = NULL;
BOOL host_find_failed_syntax= FALSE;
uschar *host_lookup = NULL;
uschar *host_data = NULL;
BOOL host_find_failed_syntax= FALSE;
uschar *host_lookup = NULL;
+BOOL host_lookup_deferred = FALSE;
BOOL host_lookup_failed = FALSE;
uschar *host_lookup_order = US"bydns:byaddr";
uschar *host_lookup_msg = US"";
BOOL host_lookup_failed = FALSE;
uschar *host_lookup_order = US"bydns:byaddr";
uschar *host_lookup_msg = US"";
@@
-787,7
+801,7
@@
date will be automatically added on the end. */
uschar *received_header_text = US
"Received: "
"${if def:sender_rcvhost {from $sender_rcvhost\n\t}"
uschar *received_header_text = US
"Received: "
"${if def:sender_rcvhost {from $sender_rcvhost\n\t}"
- "{${if def:sender_ident {from $
sender_ident
}}"
+ "{${if def:sender_ident {from $
{quote_local_part:$sender_ident}
}}"
"${if def:sender_helo_name {(helo=$sender_helo_name)\n\t}}}}"
"by $primary_hostname "
"${if def:received_protocol {with $received_protocol}} "
"${if def:sender_helo_name {(helo=$sender_helo_name)\n\t}}}}"
"by $primary_hostname "
"${if def:received_protocol {with $received_protocol}} "
@@
-846,7
+860,7
@@
router_instance router_defaults = {
NULL, /* address_data */
#ifdef EXPERIMENTAL_BRIGHTMAIL
NULL, /* bmi_rule */
NULL, /* address_data */
#ifdef EXPERIMENTAL_BRIGHTMAIL
NULL, /* bmi_rule */
-#endif
+#endif
NULL, /* cannot_route_message */
NULL, /* condition */
NULL, /* current_directory */
NULL, /* cannot_route_message */
NULL, /* condition */
NULL, /* current_directory */
@@
-1034,7
+1048,7
@@
uschar *srs_orig_recipient = NULL;
uschar *srs_orig_sender = NULL;
uschar *srs_recipient = NULL;
uschar *srs_status = NULL;
uschar *srs_orig_sender = NULL;
uschar *srs_recipient = NULL;
uschar *srs_status = NULL;
-#endif
+#endif
int string_datestamp_offset= -1;
BOOL strip_excess_angle_brackets = FALSE;
BOOL strip_trailing_dot = FALSE;
int string_datestamp_offset= -1;
BOOL strip_excess_angle_brackets = FALSE;
BOOL strip_trailing_dot = FALSE;
@@
-1120,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;
@@
-1166,7
+1181,7
@@
uschar *warnmsg_delay = NULL;
uschar *warnmsg_recipients = NULL;
BOOL write_rejectlog = TRUE;
uschar *warnmsg_recipients = NULL;
BOOL write_rejectlog = TRUE;
-uschar *version_copyright = US"Copyright (c) University of Cambridge 200
4
";
+uschar *version_copyright = US"Copyright (c) University of Cambridge 200
5
";
uschar *version_date = US"?";
uschar *version_cnumber = US"????";
uschar *version_string = US"?";
uschar *version_date = US"?";
uschar *version_cnumber = US"????";
uschar *version_string = US"?";