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

[exim.git] / src / src / globals.c

diff --git a/src/src/globals.c b/src/src/globals.c
index 94fab000d498729cb608e235de24e0aae936d005..acabeb8c3d6867ad1266c90ce91c0827ce8c44d2 100644 (file)
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -161,11 +161,6 @@ uschar *tls_ocsp_file          = NULL;
 uschar *tls_privatekey         = NULL;
 BOOL    tls_remember_esmtp     = FALSE;
 uschar *tls_require_ciphers    = NULL;
-# ifdef EXPERIMENTAL_REQUIRETLS
-uschar  tls_requiretls         = 0;    /* REQUIRETLS_MSG etc. bit #defines */
-uschar *tls_advertise_requiretls = US"*";
-const pcre *regex_REQUIRETLS   = NULL;
-# endif
 uschar *tls_try_verify_hosts   = NULL;
 uschar *tls_verify_certificates= US"system";
 uschar *tls_verify_hosts       = NULL;
@@ -868,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