projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(1) Last-minute sieve patch (updates to latest spec).
[exim.git]
/
src
/
src
/
globals.c
diff --git
a/src/src/globals.c
b/src/src/globals.c
index 8184758c8a00a4dc4d7ff74b84414209f9fd2892..497fe3d8e3d7a1133c44946ebee2f67e145eaa93 100644
(file)
--- a/
src/src/globals.c
+++ b/
src/src/globals.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/globals.c,v 1.1
4 2005/01/12 14:41:12
ph10 Exp $ */
+/* $Cambridge: exim/src/src/globals.c,v 1.1
7 2005/02/17 11:58:26
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-205,7
+205,7
@@
int acl_wherecodes[] = { 550, /* RCPT */
550, /* PREDATA */
#ifdef WITH_CONTENT_SCAN
550, /* MIME */
550, /* PREDATA */
#ifdef WITH_CONTENT_SCAN
550, /* MIME */
-#endif
+#endif
550, /* DATA */
0, /* not SMTP; not relevant */
503, /* AUTH */
550, /* DATA */
0, /* not SMTP; not relevant */
503, /* AUTH */
@@
-218,7
+218,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;
@@
-559,6
+559,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
+788,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
+847,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
+1035,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;