Cutthrough: fix race resulting in duplicate-delivery. Bug 2273

[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 43d1bbcebcb0b61a77d4a327f0e811157425360a..e0ed0244e5afee5fbfc4333a34ba0910a60a1a30 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 - 2017 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 
 /* See the file NOTICE for conditions of use and distribution. */
 
 


@@ -139,7 +139,7 @@ uschar *dkim_signers             = NULL;
 uschar *dkim_signing_domain      = NULL;
 uschar *dkim_signing_selector    = NULL;
 uschar *dkim_verify_signers      = US"$dkim_signers";
 uschar *dkim_signing_domain      = NULL;
 uschar *dkim_signing_selector    = NULL;
 uschar *dkim_verify_signers      = US"$dkim_signers";

-BOOL    dkim_collect_input       = FALSE;
+unsigned dkim_collect_input      = 0;

 BOOL    dkim_disable_verify      = FALSE;
 #endif
 
 BOOL    dkim_disable_verify      = FALSE;
 #endif
 


@@ -220,7 +220,7 @@ 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
+#ifdef SUPPORT_DANE

  FALSE, /* dane_verified */
  0,     /* tlsa_usage */
 #endif
  FALSE, /* dane_verified */
  0,     /* tlsa_usage */
 #endif