Merge tag 'exim-4_82_1'

[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 266ea86510d38612c4d5373d6d570f2e7e2e93f8..d5205d08f60379d530f6cdc644d09032e4456abd 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.16 2009/10/15 15:38:01 tom 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. */
 
 


@@ -147,6 +145,11 @@ BOOL    dkim_disable_verify      = FALSE;
 
 BOOL    dont_deliver           = FALSE;
 
 
 BOOL    dont_deliver           = FALSE;
 

+#ifdef EXPERIMENTAL_DSN
+int     dsn_ret                = 0;
+uschar *dsn_envid              = NULL;
+#endif
+

 #ifdef WITH_CONTENT_SCAN
 int     fake_response          = OK;
 #endif
 #ifdef WITH_CONTENT_SCAN
 int     fake_response          = OK;
 #endif


@@ -209,11 +212,20 @@ 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 */
+ 0,    /* bits */
+ 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;