BUGFIX: forced-fail smtp option tls_sni would dereference NULL

[users/heiko/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 ffd3b19733c07c30d2ef6ad87f20bb72f815f9da..366af7e9744c93d774f4dd8d55ad337ff7e1d61c 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.11 2007/01/08 10:50:17 ph10 Exp $ */
-

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

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

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


@@ -135,10 +133,14 @@ BOOL    deliver_freeze         = FALSE;
 int     deliver_frozen_at      = 0;
 BOOL    deliver_manual_thaw    = 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_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;
 #endif
 
 BOOL    dont_deliver           = FALSE;


@@ -160,9 +162,13 @@ uschar *local_scan_data        = NULL;
 BOOL    log_timezone           = FALSE;
 
 #ifdef WITH_CONTENT_SCAN
 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
 
 uschar *spam_score_int         = NULL;
 #endif
 

+int     max_received_linelength= 0;

 int     message_age            = 0;
 uschar *message_id;
 uschar *message_id_external;
 int     message_age            = 0;
 uschar *message_id;
 uschar *message_id_external;


@@ -201,11 +207,19 @@ 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    timestamps_utc         = FALSE;

-BOOL    tls_certificate_verified = FALSE;
-uschar *tls_cipher             = NULL;
-uschar *tls_peerdn             = NULL;
+tls_support tls_in = {
+ -1,   /* tls_active */
+ FALSE,        /* tls_certificate_verified */
+ NULL, /* tls_cipher */
+ FALSE,        /* tls_on_connect */
+ NULL, /* tls_on_connect_ports */
+ NULL, /* tls_peerdn */
+ NULL  /* tls_sni */
+};

 
 tree_node *tree_duplicates     = NULL;
 tree_node *tree_nonrecipients  = NULL;
 
 tree_node *tree_duplicates     = NULL;
 tree_node *tree_nonrecipients  = NULL;