diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2018-04-16 14:23:30 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2018-04-16 14:23:30 +0100 |
| commit | 010679682b6a32c00f61a3b2f067692f6be83a3c (patch) | |
| tree | 58670b7ef391d4782547afc9302a538fd9ff5745 /src | |
| parent | 6e6510298d8aab3ac555ee8fb88aa8a094b55d3b (diff) | |
Fix merge artifacts
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/smtp_in.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c index 08de923eb..9a9c38cd9 100644 --- a/src/src/smtp_in.c +++ b/src/src/smtp_in.c @@ -2037,6 +2037,10 @@ bmi_run = 0; bmi_verdicts = NULL; #endif dnslist_domain = dnslist_matched = NULL; +#ifdef SUPPORT_SPF +spf_header_comment = spf_received = spf_result = spf_smtp_comment = NULL; +spf_result_guessed = FALSE; +#endif #ifndef DISABLE_DKIM dkim_cur_signer = dkim_signers = dkim_signing_domain = dkim_signing_selector = dkim_signatures = NULL; @@ -2048,15 +2052,12 @@ 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_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; +#ifdef EXPERIMENTAL_ARC +arc_state = arc_state_reason = NULL; #endif dsn_ret = 0; dsn_envid = NULL; @@ -2064,17 +2065,6 @@ deliver_host = deliver_host_address = NULL; /* Can be set by ACL */ #ifndef DISABLE_PRDR prdr_requested = FALSE; #endif -#ifdef SUPPORT_SPF -spf_header_comment = spf_received = spf_result = spf_smtp_comment = NULL; -spf_result_guessed = FALSE; -#endif -#ifdef EXPERIMENTAL_DMARC -dmarc_has_been_checked = dmarc_disable_verify = dmarc_enable_forensic = FALSE; -dmarc_domain_policy = dmarc_status = dmarc_status_text = dmarc_used_domain = NULL; -#endif -#ifdef EXPERIMENTAL_ARC -arc_state = arc_state_reason = NULL; -#endif #ifdef SUPPORT_I18N message_smtputf8 = FALSE; #endif |