-/* $Cambridge: exim/src/src/globals.c,v 1.10 2004/12/17 14:52:44 ph10 Exp $ */
+/* $Cambridge: exim/src/src/globals.c,v 1.14 2005/01/12 14:41:12 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 2004 */
+/* Copyright (c) University of Cambridge 1995 - 2005 */
/* See the file NOTICE for conditions of use and distribution. */
/* All the global variables are defined together in this one module, so
BOOL extract_addresses_remove_arguments = TRUE;
uschar *extra_local_interfaces = NULL;
-#ifdef WITH_CONTENT_SCAN
BOOL fake_reject = FALSE;
-uschar *fake_reject_text = US"Your message has been rejected but is being kept for evaluation.\nIf it was a legit message, it may still be delivered to the target recipient(s).";
-#endif
+uschar *fake_reject_text = US"Your message has been rejected but is being kept for evaluation.\nIf it was a legitimate message, it may still be delivered to the target recipient(s).";
int filter_n[FILTER_VARIABLE_COUNT];
BOOL filter_running = FALSE;
int filter_sn[FILTER_VARIABLE_COUNT];
int smtp_accept_reserve = 0;
uschar *smtp_active_hostname = NULL;
BOOL smtp_authenticated = FALSE;
-uschar *smtp_banner = US"$primary_hostname ESMTP "
+uschar *smtp_banner = US"$smtp_active_hostname ESMTP "
"Exim $version_number $tod_full"
"\0<---------------Space to patch smtp_banner->";
BOOL smtp_batched_input = FALSE;