git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DMARC: default dmarc_tld_file to unset. Bug 2494
[exim.git]
/
src
/
src
/
receive.c
diff --git
a/src/src/receive.c
b/src/src/receive.c
index 83613092fea8b2d7eb32e1eae335584206d70142..f30ffd92d68fc613823671e07b54987794fb095c 100644
(file)
--- a/
src/src/receive.c
+++ b/
src/src/receive.c
@@
-1703,10
+1703,6
@@
header_line *msgid_header = NULL;
header_line *received_header;
BOOL msgid_header_newly_created = FALSE;
header_line *received_header;
BOOL msgid_header_newly_created = FALSE;
-#ifdef SUPPORT_DMARC
-int dmarc_up = 0;
-#endif
-
/* Variables for use when building the Received: header. */
uschar *timestamp;
/* Variables for use when building the Received: header. */
uschar *timestamp;
@@
-1768,7
+1764,7
@@
if (smtp_input && !smtp_batched_input && !f.dkim_disable_verify)
#endif
#ifdef SUPPORT_DMARC
#endif
#ifdef SUPPORT_DMARC
-
dmarc_up = dmarc_init();
/* initialize libopendmarc */
+
if (sender_host_address) dmarc_init();
/* initialize libopendmarc */
#endif
/* Remember the time of reception. Exim uses time+pid for uniqueness of message
#endif
/* Remember the time of reception. Exim uses time+pid for uniqueness of message
@@
-3499,7
+3495,7
@@
else
#endif /* WITH_CONTENT_SCAN */
#ifdef SUPPORT_DMARC
#endif /* WITH_CONTENT_SCAN */
#ifdef SUPPORT_DMARC
- dmarc_
up = dmarc_
store_data(from_header);
+ dmarc_store_data(from_header);
#endif
#ifndef DISABLE_PRDR
#endif
#ifndef DISABLE_PRDR