X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/b08b24c880b30c34f3ed5f4c59a286fdefb1c0f5..cc5fdbc2db990d876fb7bfa68f9c7253d064cef7:/src/exim_monitor/em_globals.c diff --git a/src/exim_monitor/em_globals.c b/src/exim_monitor/em_globals.c index 44389c195..b333a9461 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.5 2005/01/25 14:16:33 ph10 Exp $ */ +/* $Cambridge: exim/src/exim_monitor/em_globals.c,v 1.17 2009/11/16 19:50:36 nm4 Exp $ */ /************************************************* * Exim Monitor * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2005 */ +/* Copyright (c) University of Cambridge 1995 - 2009 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -52,7 +52,7 @@ uschar *bmi_verdicts = NULL; int body_max = 20000; uschar *exim_path = US BIN_DIRECTORY "/exim" - "\0<---------------Space to patch exim_path->"; + "\0<---------------Space to patch exim_path->"; int eximon_initialized = FALSE; @@ -117,9 +117,8 @@ that fires up the monitor fishes the value out by using -bP anyway. */ #define SPOOL_DIRECTORY "" #endif - -uschar *acl_var[ACL_C_MAX+ACL_M_MAX]; - +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; @@ -135,10 +134,21 @@ BOOL deliver_firsttime = FALSE; BOOL deliver_freeze = FALSE; int deliver_frozen_at = 0; BOOL deliver_manual_thaw = FALSE; + +#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; #ifdef WITH_CONTENT_SCAN -BOOL fake_reject = FALSE; +int fake_response = OK; #endif header_line *header_last = NULL; @@ -154,9 +164,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;