Merge branch 'sasl_fixes'

[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 16c0aa413e00070f308f884cb26a3ded07ef2245..a058e90ed857c460f7b3d1fef25bf94d6ffa9687 100644 (file)
--- a/src/exim_monitor/em_globals.c
+++ b/src/exim_monitor/em_globals.c
@@ -1,10 +1,8 @@
-/* $Cambridge: exim/src/exim_monitor/em_globals.c,v 1.15 2009/06/15 19:54:32 tom Exp $ */
-

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

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

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


@@ -136,10 +134,11 @@ int     deliver_frozen_at      = 0;
 BOOL    deliver_manual_thaw    = FALSE;
 
 #ifndef DISABLE_DKIM
 BOOL    deliver_manual_thaw    = FALSE;
 
 #ifndef DISABLE_DKIM

-uschar *dkim_signing_domains     = NULL;
+uschar *dkim_cur_signer          = NULL;
+uschar *dkim_signers             = NULL;

 uschar *dkim_signing_domain      = NULL;
 uschar *dkim_signing_selector    = NULL;
 uschar *dkim_signing_domain      = NULL;
 uschar *dkim_signing_selector    = NULL;

-uschar *dkim_verify_signers      = US"$dkim_signing_domains";
+uschar *dkim_verify_signers      = US"$dkim_signers";

 BOOL    dkim_collect_input       = FALSE;
 BOOL    dkim_disable_verify      = FALSE;
 #endif
 BOOL    dkim_collect_input       = FALSE;
 BOOL    dkim_disable_verify      = FALSE;
 #endif


@@ -208,6 +207,8 @@ uschar *smtp_active_hostname   = NULL;
 BOOL    split_spool_directory  = FALSE;
 uschar *spool_directory        = US SPOOL_DIRECTORY;
 int     string_datestamp_offset=-1;
 BOOL    split_spool_directory  = FALSE;
 uschar *spool_directory        = US SPOOL_DIRECTORY;
 int     string_datestamp_offset=-1;

+int     string_datestamp_length= 0;
+int     string_datestamp_type  = -1;

 
 BOOL    timestamps_utc         = FALSE;
 BOOL    tls_certificate_verified = FALSE;
 
 BOOL    timestamps_utc         = FALSE;
 BOOL    tls_certificate_verified = FALSE;