Fix retry key bug for pipe, file, or autoreply deliveries.

[users/heiko/exim.git] / src / exim_monitor / em_globals.c

diff --git a/src/exim_monitor/em_globals.c b/src/exim_monitor/em_globals.c
index ae38e9f8a81cf34394f724c58aa45c814ecb18dd..621d8b207fc7f4ab3aebd519d2c660eaaf5517ba 100644 (file)
--- a/src/exim_monitor/em_globals.c
+++ b/src/exim_monitor/em_globals.c
@@ -1,10 +1,10 @@
-/* $Cambridge: exim/src/exim_monitor/em_globals.c,v 1.1 2004/10/07 10:39:01 ph10 Exp $ */
+/* $Cambridge: exim/src/exim_monitor/em_globals.c,v 1.9 2006/02/07 11:18:59 ph10 Exp $ */

 
 /*************************************************
 *                Exim Monitor                    *
 *************************************************/
 
 
 /*************************************************
 *                Exim Monitor                    *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2004 */
+/* Copyright (c) University of Cambridge 1995 - 2006 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 
 /* See the file NOTICE for conditions of use and distribution. */
 
 


@@ -44,10 +44,15 @@ uschar  actioned_message[24];
 uschar *action_required;
 uschar *alternate_config = NULL;
 
 uschar *action_required;
 uschar *alternate_config = NULL;
 

+#ifdef EXPERIMENTAL_BRIGHTMAIL
+int     bmi_run                = 0;
+uschar *bmi_verdicts           = NULL;
+#endif
+

 int     body_max = 20000;
 
 uschar *exim_path              = US BIN_DIRECTORY "/exim"
 int     body_max = 20000;
 
 uschar *exim_path              = US BIN_DIRECTORY "/exim"

-                       "\0<---------------Space to patch exim_path->";
+                        "\0<---------------Space to patch exim_path->";

 
 int     eximon_initialized = FALSE;
 
 
 int     eximon_initialized = FALSE;
 


@@ -113,7 +118,7 @@ that fires up the monitor fishes the value out by using -bP anyway. */
 #endif
 
 
 #endif
 
 

-uschar *acl_var[ACL_C_MAX+ACL_M_MAX];
+uschar *acl_var[ACL_CVARS + ACL_MVARS];

 
 uschar *active_hostname        = NULL;
 BOOL    allow_unqualified_recipient = FALSE;
 
 uschar *active_hostname        = NULL;
 BOOL    allow_unqualified_recipient = FALSE;


@@ -130,11 +135,23 @@ BOOL    deliver_firsttime      = FALSE;
 BOOL    deliver_freeze         = FALSE;
 int     deliver_frozen_at      = 0;
 BOOL    deliver_manual_thaw    = FALSE;
 BOOL    deliver_freeze         = FALSE;
 int     deliver_frozen_at      = 0;
 BOOL    deliver_manual_thaw    = FALSE;

+
+#ifdef EXPERIMENTAL_DOMAINKEYS
+uschar *dk_signing_domain      = NULL;
+uschar *dk_signing_selector    = NULL;
+int     dk_do_verify           = 0;
+#endif
+

 BOOL    dont_deliver           = FALSE;
 
 BOOL    dont_deliver           = FALSE;
 

+#ifdef WITH_CONTENT_SCAN
+int     fake_response          = OK;
+#endif
+

 header_line *header_last       = NULL;
 header_line *header_list       = NULL;
 
 header_line *header_last       = NULL;
 header_line *header_list       = NULL;
 

+BOOL    host_lookup_deferred   = FALSE;

 BOOL    host_lookup_failed     = FALSE;
 uschar *interface_address      = NULL;
 int     interface_port         = 0;
 BOOL    host_lookup_failed     = FALSE;
 uschar *interface_address      = NULL;
 int     interface_port         = 0;


@@ -142,6 +159,11 @@ int     interface_port         = 0;
 BOOL    local_error_message    = FALSE;
 uschar *local_scan_data        = NULL;
 BOOL    log_timezone           = FALSE;
 BOOL    local_error_message    = FALSE;
 uschar *local_scan_data        = NULL;
 BOOL    log_timezone           = FALSE;

+
+#ifdef WITH_CONTENT_SCAN
+uschar *spam_score_int         = NULL;
+#endif
+

 int     message_age            = 0;
 uschar *message_id;
 uschar *message_id_external;
 int     message_age            = 0;
 uschar *message_id;
 uschar *message_id_external;


@@ -175,6 +197,7 @@ int     sender_host_port       = 0;
 uschar *sender_ident           = NULL;
 BOOL    sender_local           = FALSE;
 BOOL    sender_set_untrusted   = FALSE;
 uschar *sender_ident           = NULL;
 BOOL    sender_local           = FALSE;
 BOOL    sender_set_untrusted   = FALSE;

+uschar *smtp_active_hostname   = NULL;

 
 BOOL    split_spool_directory  = FALSE;
 uschar *spool_directory        = US SPOOL_DIRECTORY;
 
 BOOL    split_spool_directory  = FALSE;
 uschar *spool_directory        = US SPOOL_DIRECTORY;