git://git.exim.org
/
users
/
jgh
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6e65102
)
Fix merge artifacts
author
Jeremy Harris
<jgh146exb@wizmail.org>
Mon, 16 Apr 2018 13:23:30 +0000
(14:23 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Mon, 16 Apr 2018 13:23:30 +0000
(14:23 +0100)
src/src/smtp_in.c
patch
|
blob
|
history
diff --git
a/src/src/smtp_in.c
b/src/src/smtp_in.c
index 08de923ebe3ebc346d50be760ec2cbd51e20e232..9a9c38cd971614a4511a1abb6bd7642d76c5968b 100644
(file)
--- 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;
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;
#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;
#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
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;
#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
#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
#ifdef SUPPORT_I18N
message_smtputf8 = FALSE;
#endif