* 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. */
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 dont_deliver = FALSE;
+int dsn_ret = 0;
+uschar *dsn_envid = NULL;
+
#ifdef WITH_CONTENT_SCAN
int fake_response = OK;
#endif
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 */