Init the resolver even in -be mode.

[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 d5205d08f60379d530f6cdc644d09032e4456abd..6415e4238675ed0042a167a2a29b9e9ecbc50d1d 100644 (file)
--- a/src/exim_monitor/em_globals.c
+++ b/src/exim_monitor/em_globals.c
@@ -2,7 +2,7 @@
 *                Exim Monitor                    *
 *************************************************/
 
 *                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. */
 
 
 /* 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;
 
 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
 BOOL    deliver_manual_thaw    = FALSE;
 
 #ifndef DISABLE_DKIM


@@ -145,10 +145,8 @@ BOOL    dkim_disable_verify      = FALSE;
 
 BOOL    dont_deliver           = FALSE;
 
 
 BOOL    dont_deliver           = FALSE;
 

-#ifdef EXPERIMENTAL_DSN

 int     dsn_ret                = 0;
 uschar *dsn_envid              = NULL;
 int     dsn_ret                = 0;
 uschar *dsn_envid              = NULL;

-#endif

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


@@ -220,6 +218,10 @@ tls_support tls_in = {
  -1,   /* tls_active */
  0,    /* bits */
  FALSE,        /* tls_certificate_verified */
  -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_cipher */
  FALSE,        /* tls_on_connect */
  NULL, /* tls_on_connect_ports */