X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fexim_monitor%2Fem_globals.c;h=9221ae2da1cef06a4ef917db6fffc054e0af8bcb;hb=ff5aac2be82177a7c96c71ce7dd0939e70436402;hp=b0a912e5f5542c9622b160a840e8bbd514587cf3;hpb=6c60858ca0037cfdbd48dac9f221da35a0ea64b6;p=exim.git

diff --git a/src/exim_monitor/em_globals.c b/src/exim_monitor/em_globals.c
index b0a912e5f..9221ae2da 100644
--- a/src/exim_monitor/em_globals.c
+++ b/src/exim_monitor/em_globals.c
@@ -2,7 +2,7 @@
 *                Exim Monitor                    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2012 */
+/* Copyright (c) University of Cambridge 1995 - 2015 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
@@ -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,9 @@ BOOL    dkim_disable_verify      = FALSE;
 
 BOOL    dont_deliver           = FALSE;
 
+int     dsn_ret                = 0;
+uschar *dsn_envid              = NULL;
+
 #ifdef WITH_CONTENT_SCAN
 int     fake_response          = OK;
 #endif
@@ -184,6 +187,8 @@ uid_t   originator_uid;
 
 uschar *primary_hostname       = NULL;
 
+uschar *queue_name             = US"";
+
 int     received_count         = 0;
 uschar *received_protocol      = NULL;
 int     received_time          = 0;
@@ -215,6 +220,10 @@ 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 */