ARC: cutthrough delivery may not be used with ARC signing

[user/henk/code/exim.git] / src / src / globals.c

diff --git a/src/src/globals.c b/src/src/globals.c
index 1db5ece3297aacfcf8508739d8c3061d8aa9f728..7d18b38b56a19c354e6360d8ee0ba3b6d34f109d 100644 (file)
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -427,12 +427,14 @@ struct arc_set *arc_received      = NULL;
 int     arc_received_instance  = 0;
 int     arc_oldest_pass                = 0;
 const uschar *arc_state                = NULL;
+const uschar *arc_state_reason = NULL;
 #endif
 
 uschar *authenticated_fail_id  = NULL;
 uschar *authenticated_id       = NULL;
 uschar *authenticated_sender   = NULL;
 BOOL    authentication_failed  = FALSE;
+BOOL    authentication_local   = FALSE;
 auth_instance  *auths          = NULL;
 uschar *auth_advertise_hosts   = US"*";
 auth_instance auth_defaults    = {
@@ -681,7 +683,6 @@ uschar *dkim_verify_reason   = NULL;
 #endif
 #ifdef EXPERIMENTAL_DMARC
 BOOL    dmarc_has_been_checked  = FALSE;
-uschar *dmarc_ar_header         = NULL;
 uschar *dmarc_domain_policy     = NULL;
 uschar *dmarc_forensic_sender   = NULL;
 uschar *dmarc_history_file      = NULL;
@@ -1382,6 +1383,7 @@ uschar *spf_guess              = US"v=spf1 a/24 mx/24 ptr ?all";
 uschar *spf_header_comment     = NULL;
 uschar *spf_received           = NULL;
 uschar *spf_result             = NULL;
+BOOL    spf_result_guessed     = FALSE;
 uschar *spf_smtp_comment       = NULL;
 #endif
 
@@ -1560,7 +1562,7 @@ uschar *uucp_from_sender       = US"$1";
 uschar *verify_mode           = NULL;
 uschar *version_copyright      =
  US"Copyright (c) University of Cambridge, 1995 - 2018\n"
-   "(c) The Exim Maintainers and contributors in ACKNOWLEDGMENTS file, 2007 - 2017";
+   "(c) The Exim Maintainers and contributors in ACKNOWLEDGMENTS file, 2007 - 2018";
 uschar *version_date           = US"?";
 uschar *version_cnumber        = US"????";
 uschar *version_string         = US"?";