-/* $Cambridge: exim/src/exim_monitor/em_globals.c,v 1.13 2008/01/16 09:32:25 tom Exp $ */
+/* $Cambridge: exim/src/exim_monitor/em_globals.c,v 1.16 2009/10/15 15:38:01 tom Exp $ */
/*************************************************
* Exim Monitor *
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_cur_signer = NULL;
+uschar *dkim_signers = NULL;
+uschar *dkim_signing_domain = NULL;
+uschar *dkim_signing_selector = NULL;
+uschar *dkim_verify_signers = US"$dkim_signers";
+BOOL dkim_collect_input = FALSE;
+BOOL dkim_disable_verify = FALSE;
#endif
BOOL dont_deliver = FALSE;
BOOL log_timezone = FALSE;
#ifdef WITH_CONTENT_SCAN
+uschar *spam_bar = NULL;
+uschar *spam_report = NULL;
+uschar *spam_score = NULL;
uschar *spam_score_int = NULL;
#endif