X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/38a0a95ff69327042421b9ee6982e386175f141b..da5dfc3ab22a3189116ea5c78927e9884529c0c0:/src/exim_monitor/em_globals.c?ds=sidebyside diff --git a/src/exim_monitor/em_globals.c b/src/exim_monitor/em_globals.c index 361ac4e78..16c0aa413 100644 --- 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.10 2006/09/19 11:28:45 ph10 Exp $ */ +/* $Cambridge: exim/src/exim_monitor/em_globals.c,v 1.15 2009/06/15 19:54:32 tom Exp $ */ /************************************************* * 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. */ @@ -135,10 +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; +#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; @@ -160,9 +163,13 @@ uschar *local_scan_data = NULL; 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 +int max_received_linelength= 0; int message_age = 0; uschar *message_id; uschar *message_id_external;