Make dns_again_means_nonexist apply to gethostbyname lookups as well.

[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 44389c195d70ddf2fa39bdd63b53ab0020556866..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.5 2005/01/25 14:16:33 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 - 2005 */
+/* 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. */
 
 


@@ -52,7 +52,7 @@ uschar *bmi_verdicts           = NULL;
 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;
 


@@ -118,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;


@@ -135,10 +135,17 @@ 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;
 
 #ifdef WITH_CONTENT_SCAN
 BOOL    dont_deliver           = FALSE;
 
 #ifdef WITH_CONTENT_SCAN

-BOOL   fake_reject             = FALSE;
+int     fake_response          = OK;

 #endif
 
 header_line *header_last       = NULL;
 #endif
 
 header_line *header_last       = NULL;