Merge branch '4.next'

diff --cc src/src/smtp_in.c
index cf1d9fd9013e9d76765f10d0d64f26145932c353,2881dd95903f353f1c8753233973b250cccdce5c..08de923ebe3ebc346d50be760ec2cbd51e20e232
--- 1/src/src/smtp_in.c
--- 2/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;