X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/c4ceed07f17f67af7d96e7fd27c92eb374e62e19..2b08f19207269c2862fe616598791b28d65187dd:/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 816d42d05..918659d98 100644
--- a/src/exim_monitor/em_globals.c
+++ b/src/exim_monitor/em_globals.c
@@ -130,7 +130,7 @@ int     body_zerocount         = 0;
 
 BOOL    deliver_firsttime      = FALSE;
 BOOL    deliver_freeze         = FALSE;
-int     deliver_frozen_at      = 0;
+time_t  deliver_frozen_at      = 0;
 BOOL    deliver_manual_thaw    = FALSE;
 
 #ifndef DISABLE_DKIM
@@ -145,6 +145,11 @@ BOOL    dkim_disable_verify      = 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
@@ -211,12 +216,20 @@ int     string_datestamp_length= 0;
 int     string_datestamp_type  = -1;
 
 BOOL    timestamps_utc         = FALSE;
-BOOL    tls_certificate_verified = FALSE;
-uschar *tls_cipher             = NULL;
-uschar *tls_peerdn             = NULL;
-#ifdef SUPPORT_TLS
-uschar *tls_sni                = NULL;
+tls_support tls_in = {
+ -1,	/* tls_active */
+ 0,	/* bits */
+ FALSE,	/* tls_certificate_verified */
+#ifdef EXPERIMENTAL_DANE
+ FALSE, /* dane_verified */
+ 0,     /* tlsa_usage */
 #endif
+ 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;