From 687cac44312c8adc6f999882b49f0705bcb8613c Mon Sep 17 00:00:00 2001
From: "Heiko Schlittermann (HS12-RIPE)" <hs@schlittermann.de>
Date: Fri, 30 Jun 2017 17:22:08 +0200
Subject: [PATCH] Configure the default opendmarc.tlds file in EDITME

---
 doc/doc-txt/NewStuff      | 3 ++-
 src/src/EDITME            | 1 +
 src/src/config.h.defaults | 7 ++++++-
 src/src/dmarc.c           | 3 +--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index d0d5cf22c..17fe1979a 100644
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -400,7 +400,8 @@ Version 4.82
     It adds new expansion variables $dmarc_ar_header, $dmarc_status,
     $dmarc_status_text, and $dmarc_used_domain.  It adds a new acl modifier
     dmarc_status.  It adds new control flags dmarc_disable_verify and
-    dmarc_enable_forensic.
+    dmarc_enable_forensic. The default for the dmarc_tld_file option is
+    "/etc/exim/opendmarc.tlds" and can be changed via EDITME.
 
 22. Add expansion variable $authenticated_fail_id, which is the username
     provided to the authentication method which failed.  It is available
diff --git a/src/src/EDITME b/src/src/EDITME
index 5ac5a55dc..e604acd8b 100644
--- a/src/src/EDITME
+++ b/src/src/EDITME
@@ -473,6 +473,7 @@ EXIM_MONITOR=eximon.bin
 # Uncomment the following line to add DMARC checking capability, implemented
 # using libopendmarc libraries.  You must have SPF support enabled also.
 # EXPERIMENTAL_DMARC=yes
+# DMARC_TLD_FILE= /etc/exim/opendmarc.tlds
 # CFLAGS += -I/usr/local/include
 # LDFLAGS += -lopendmarc
 
diff --git a/src/src/config.h.defaults b/src/src/config.h.defaults
index 58e181309..dbfde8935 100644
--- a/src/src/config.h.defaults
+++ b/src/src/config.h.defaults
@@ -8,7 +8,10 @@
 /* The default settings for Exim configuration variables. A #define without
 any data just defines the existence of the variable; it won't get included
 in config.h unless some value is defined in Local/Makefile. If there is data,
-it's a default value. */
+it's a default value.
+
+Do not put spaces between # and the 'define'.
+*/
 
 #define ALT_CONFIG_PREFIX
 #define TRUSTED_CONFIG_LIST
@@ -178,11 +181,13 @@ it's a default value. */
 #define EXPERIMENTAL_DCC
 #define EXPERIMENTAL_DSN_INFO
 #define EXPERIMENTAL_DMARC
+    #define DMARC_TLD_FILE "/etc/exim/opendmarc.tlds"
 #define EXPERIMENTAL_LMDB
 #define EXPERIMENTAL_QUEUEFILE
 #define EXPERIMENTAL_SPF
 #define EXPERIMENTAL_SRS
 
+
 /* For developers */
 #define WANT_DEEPER_PRINTF_CHECKS
 
diff --git a/src/src/dmarc.c b/src/src/dmarc.c
index c005d4ab9..275ad46c7 100644
--- a/src/src/dmarc.c
+++ b/src/src/dmarc.c
@@ -83,8 +83,7 @@ int dmarc_init()
 int *netmask   = NULL;   /* Ignored */
 int is_ipv6    = 0;
 char *tld_file = (dmarc_tld_file == NULL) ?
-		 "/etc/exim/opendmarc.tlds" :
-		 (char *)dmarc_tld_file;
+		 DMARC_TLD_FILE : (char *)dmarc_tld_file;
 
 /* Set some sane defaults.  Also clears previous results when
  * multiple messages in one connection. */
-- 
2.30.2