X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/ec4b68e5d820109e5954329013a911d4032bc4dc..e162fc9757d4b8cb41aca74214e968622d6c3dee:/src/exim_monitor/em_globals.c?ds=inline diff --git a/src/exim_monitor/em_globals.c b/src/exim_monitor/em_globals.c index 366af7e97..6415e4238 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 @@ -213,7 +216,12 @@ int string_datestamp_type = -1; BOOL timestamps_utc = FALSE; 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 */