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 dc69e2f8923ef7cf2e6697e5e9b585df2d0a5334..a27ad3fd24fe82b5ff79596b18c820543d5f2f23 100644 (file)
--- 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 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
 #define EXPERIMENTAL_LMDB
 #define EXPERIMENTAL_PIPE_CONNECT
 #define EXPERIMENTAL_QUEUEFILE

diff --git a/src/src/globals.c b/src/src/globals.c
index f52ae92cec76ffe32f11fdbbad5ab51f434bd830..acabeb8c3d6867ad1266c90ce91c0827ce8c44d2 100644 (file)
--- 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_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
 
 uschar *dmarc_used_domain       = NULL;
 #endif