From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 15 Apr 2018 16:50:14 +0000 (+0100)
Subject: Merge branch '4.next'
X-Git-Tag: exim-4.92-RC1~216
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6372d4c990f39ba6ad84a91af0a3a61a63bd50a3;p=exim.git

Merge branch '4.next'
---

6372d4c990f39ba6ad84a91af0a3a61a63bd50a3
diff --cc src/src/smtp_in.c
index cf1d9fd90,2881dd959..08de923eb
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@@ -2040,16 -2042,12 +2040,22 @@@ dnslist_domain = dnslist_matched = NULL
  #ifndef DISABLE_DKIM
  dkim_cur_signer = dkim_signers =
  dkim_signing_domain = dkim_signing_selector = dkim_signatures = NULL;
 +dkim_cur_signer = dkim_signers = dkim_signing_domain = dkim_signing_selector = NULL;
  dkim_disable_verify = dkim_collect_input = FALSE;
 +dkim_verify_overall = dkim_verify_status = dkim_verify_reason = NULL;
 +dkim_key_length = 0;
 +dkim_verify_signers = US"$dkim_signers";
 +#endif
 +#ifdef EXPERIMENTAL_DMARC
 +dmarc_has_been_checked = dmarc_disable_verify = dmarc_enable_forensic = FALSE;
 +dmarc_ar_header = dmarc_domain_policy = dmarc_forensic_sender =
 +dmarc_history_file = dmarc_status = dmarc_status_text = dmarc_tld_file =
++dmarc_used_domain = NULL;
+ #endif
+ #ifdef EXPERIMENTAL_DMARC
+ dmarc_has_been_checked = dmarc_disable_verify = dmarc_enable_forensic = FALSE;
+ dmarc_ar_header = dmarc_domain_policy = dmarc_forensic_sender =
+ dmarc_history_file = dmarc_status = dmarc_status_text = dmarc_tld_file =
  dmarc_used_domain = NULL;
  #endif
  dsn_ret = 0;