From: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Date: Thu, 21 Mar 2019 21:42:05 +0000 (+0100)
Subject: Use the DMARC_TLD_FILE from config.h.defaults and Local/Makefile
X-Git-Tag: exim-4.93-RC0~250
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=dbb8fff1d199ba2f88bbbc09a87b883022d77f3f;p=exim.git

Use the DMARC_TLD_FILE from config.h.defaults and Local/Makefile
---

diff --git a/src/src/config.h.defaults b/src/src/config.h.defaults
index dc69e2f89..a27ad3fd2 100644
--- a/src/src/config.h.defaults
+++ b/src/src/config.h.defaults
@@ -198,7 +198,7 @@ Do not put spaces between # and the 'define'.
 #define EXPERIMENTAL_DCC
 #define EXPERIMENTAL_DSN_INFO
 #define EXPERIMENTAL_DMARC
-    #define DMARC_TLD_FILE "/etc/exim/opendmarc.tlds"
+#define DMARC_TLD_FILE "/etc/exim/opendmarc.tlds"
 #define EXPERIMENTAL_LMDB
 #define EXPERIMENTAL_PIPE_CONNECT
 #define EXPERIMENTAL_QUEUEFILE
diff --git a/src/src/globals.c b/src/src/globals.c
index f52ae92ce..acabeb8c3 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -863,7 +863,7 @@ uschar *dmarc_forensic_sender   = NULL;
 uschar *dmarc_history_file      = NULL;
 uschar *dmarc_status            = NULL;
 uschar *dmarc_status_text       = NULL;
-uschar *dmarc_tld_file          = NULL;
+uschar *dmarc_tld_file          = US DMARC_TLD_FILE;
 uschar *dmarc_used_domain       = NULL;
 #endif