-/* $Cambridge: exim/src/src/globals.c,v 1.15 2005/01/25 14:16:33 ph10 Exp $ */
+/* $Cambridge: exim/src/src/globals.c,v 1.21 2005/04/04 10:33:49 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
BOOL opt_perl_started = FALSE;
#endif
+#ifdef EXPAND_DLFUNC
+tree_node *dlobj_anchor = NULL;
+#endif
+
#ifdef LOOKUP_IBASE
uschar *ibase_servers = NULL;
#endif
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;
550, /* PREDATA */
#ifdef WITH_CONTENT_SCAN
550, /* MIME */
-#endif
+#endif
550, /* DATA */
0, /* not SMTP; not relevant */
503, /* AUTH */
550, /* STARTTLS */
252 /* VRFY */
};
-
+
BOOL active_local_from_check = FALSE;
BOOL active_local_sender_retain = FALSE;
BOOL accept_8bitmime = 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 *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}} "
NULL, /* address_data */
#ifdef EXPERIMENTAL_BRIGHTMAIL
NULL, /* bmi_rule */
-#endif
+#endif
NULL, /* cannot_route_message */
NULL, /* condition */
NULL, /* current_directory */
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;
uschar *warnmsg_recipients = NULL;
BOOL write_rejectlog = TRUE;
-uschar *version_copyright = US"Copyright (c) University of Cambridge 2004";
+uschar *version_copyright = US"Copyright (c) University of Cambridge 2005";
uschar *version_date = US"?";
uschar *version_cnumber = US"????";
uschar *version_string = US"?";