summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Kistner <tom@duncanthrax.net>2009-06-15 19:54:32 +0000
committerTom Kistner <tom@duncanthrax.net>2009-06-15 19:54:32 +0000
commit015f07e61c892d9edeeeaf600537251b3f2a98b9 (patch)
tree45894ffe09921a64512ec69350a8b9d2184642d1
parent68950195049ccd928c49ff6d6b0bea70813f0e17 (diff)
Fixup eximon compile. Thanks Graeme.
-rw-r--r--src/exim_monitor/em_globals.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/exim_monitor/em_globals.c b/src/exim_monitor/em_globals.c
index fc15dc704..16c0aa413 100644
--- a/src/exim_monitor/em_globals.c
+++ b/src/exim_monitor/em_globals.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/exim_monitor/em_globals.c,v 1.14 2008/12/30 13:12:02 michael Exp $ */
+/* $Cambridge: exim/src/exim_monitor/em_globals.c,v 1.15 2009/06/15 19:54:32 tom Exp $ */
/*************************************************
* Exim Monitor *
@@ -135,16 +135,13 @@ 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
-
-#ifdef EXPERIMENTAL_DKIM
-uschar *dkim_signing_domain = NULL;
-uschar *dkim_signing_selector = NULL;
-int dkim_do_verify = 0;
+#ifndef DISABLE_DKIM
+uschar *dkim_signing_domains = NULL;
+uschar *dkim_signing_domain = NULL;
+uschar *dkim_signing_selector = NULL;
+uschar *dkim_verify_signers = US"$dkim_signing_domains";
+BOOL dkim_collect_input = FALSE;
+BOOL dkim_disable_verify = FALSE;
#endif
BOOL dont_deliver = FALSE;