I happen to be looking at this again, so while I am here I'll polish the wording...

[users/jgh/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 621d8b207fc7f4ab3aebd519d2c660eaaf5517ba..f6dcef384d4350a8dc7b389005057b5a850f6e17 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.9 2006/02/07 11:18:59 ph10 Exp $ */
+/* $Cambridge: exim/src/exim_monitor/em_globals.c,v 1.13 2008/01/16 09:32:25 tom Exp $ */

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

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

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


@@ -117,9 +117,8 @@ that fires up the monitor fishes the value out by using -bP anyway. */
 #define SPOOL_DIRECTORY ""
 #endif
 
 #define SPOOL_DIRECTORY ""
 #endif
 

-
-uschar *acl_var[ACL_CVARS + ACL_MVARS];
-
+tree_node *acl_var_c           = NULL;
+tree_node *acl_var_m           = NULL;

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


@@ -142,6 +141,12 @@ uschar *dk_signing_selector    = NULL;
 int     dk_do_verify           = 0;
 #endif
 
 int     dk_do_verify           = 0;
 #endif
 

+#ifdef EXPERIMENTAL_DKIM
+uschar *dkim_signing_domain    = NULL;
+uschar *dkim_signing_selector  = NULL;
+int dkim_do_verify             = 0;
+#endif
+

 BOOL    dont_deliver           = FALSE;
 
 #ifdef WITH_CONTENT_SCAN
 BOOL    dont_deliver           = FALSE;
 
 #ifdef WITH_CONTENT_SCAN


@@ -164,6 +169,7 @@ BOOL    log_timezone           = FALSE;
 uschar *spam_score_int         = NULL;
 #endif
 
 uschar *spam_score_int         = NULL;
 #endif
 

+int     max_received_linelength= 0;

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