DMARC: check for empty filename for TLD file. Patch testsuite to not break on missing default TLD file.

24 files changed, 99 insertions, 1 deletions

diff --git a/test/confs/0002 b/test/confs/0002
index 165f0a4b2..7e565805b 100644
--- a/test/confs/0002
+++ b/test/confs/0002
@@ -15,6 +15,9 @@ tls_advertise_hosts =
 .ifdef _HAVE_PIPE_CONNECT
 pipelining_connect_advertise_hosts = :
 .endif
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
 
 # ----- Main settings -----
 
diff --git a/test/confs/0241 b/test/confs/0241
index e7d92078b..644ed6b1f 100644
--- a/test/confs/0241
+++ b/test/confs/0241
@@ -9,6 +9,10 @@ gecos_pattern = ""
 gecos_name = CALLER_NAME
 tls_advertise_hosts =
 
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+
 # ----- Main settings -----
 
 qualify_domain = test.ex
diff --git a/test/confs/0437 b/test/confs/0437
index d0ea77ea1..863655b4e 100644
--- a/test/confs/0437
+++ b/test/confs/0437
@@ -11,6 +11,10 @@ gecos_pattern = ""
 gecos_name = CALLER_NAME
 tls_advertise_hosts =
 
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+
 # ----- Main settings -----
 
 queue_run_in_order
diff --git a/test/confs/0564 b/test/confs/0564
index e01628550..de71325af 100644
--- a/test/confs/0564
+++ b/test/confs/0564
@@ -12,6 +12,9 @@ tls_advertise_hosts =
 .ifdef _HAVE_PIPE_CONNECT
 pipelining_connect_advertise_hosts =
 .endif
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
 
 # ----- Main settings -----
 
diff --git a/test/confs/0601 b/test/confs/0601
index faf44ce98..8b47f3d7e 100644
--- a/test/confs/0601
+++ b/test/confs/0601
@@ -7,6 +7,9 @@ spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 tls_advertise_hosts =
 queue_only
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
 
 # ----- Main settings -----
 
diff --git a/test/confs/0611 b/test/confs/0611
index 4f6f490d3..d3e0a47b2 100644
--- a/test/confs/0611
+++ b/test/confs/0611
@@ -13,6 +13,10 @@ gecos_name = CALLER_NAME
 tls_advertise_hosts =
 chunking_advertise_hosts =
 
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+
 # ----- Main settings -----
 
 log_file_path = DIR/spool/log/${if eq {SERVER}{server} {server_}{}}%slog
diff --git a/test/confs/0615 b/test/confs/0615
index 63b9d7fac..0cf5769a9 100644
--- a/test/confs/0615
+++ b/test/confs/0615
@@ -11,6 +11,10 @@ gecos_name = CALLER_NAME
 chunking_advertise_hosts =
 tls_advertise_hosts =
 
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+
 primary_hostname = myhost.test.ex
 queue_only
 
diff --git a/test/confs/0619 b/test/confs/0619
index dc23661ac..dcb7fa89e 100644
--- a/test/confs/0619
+++ b/test/confs/0619
@@ -13,6 +13,10 @@ gecos_name = CALLER_NAME
 chunking_advertise_hosts =
 tls_advertise_hosts =
 
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+
 primary_hostname = myhost.test.ex
 queue_only
 
diff --git a/test/confs/0900 b/test/confs/0900
index caf17be81..ce6f2c379 100644
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -19,6 +19,9 @@ tls_advertise_requiretls = :
 .ifdef _HAVE_PIPE_CONNECT
 pipelining_connect_advertise_hosts = :
 .endif
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
 
 
 # ----- Main settings -----
diff --git a/test/confs/0901 b/test/confs/0901
index c2eb5cca6..67b73cd19 100644
--- a/test/confs/0901
+++ b/test/confs/0901
@@ -14,6 +14,10 @@ gecos_name = CALLER_NAME
 chunking_advertise_hosts = *
 tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
 
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+
 pipelining_advertise_hosts = :
 
 # ----- Main settings -----
diff --git a/test/confs/0906 b/test/confs/0906
index ff99d9304..6df517e53 100644
--- a/test/confs/0906
+++ b/test/confs/0906
@@ -13,6 +13,9 @@ tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
 .ifdef _HAVE_PIPE_CONNECT
 pipelining_connect_advertise_hosts =
 .endif
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
 
 # ----- Main settings -----
 
diff --git a/test/confs/2026 b/test/confs/2026
index 7da11a528..c678219db 100644
--- a/test/confs/2026
+++ b/test/confs/2026
@@ -13,6 +13,10 @@ log_file_path = DIR/spool/log/%D-%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+
 # ----- Main settings -----
 
 acl_smtp_rcpt = check_rcpt
diff --git a/test/confs/4050 b/test/confs/4050
index 06a85c089..2db951d22 100644
--- a/test/confs/4050
+++ b/test/confs/4050
@@ -22,6 +22,10 @@ dns_cname_loops = 9
 chunking_advertise_hosts =
 tls_advertise_hosts =
 
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+
 pipelining_connect_advertise_hosts = CONNECTCOND
 retry_data_expire = RETRY
 log_selector = +received_recipients +pipelining
diff --git a/test/confs/4053 b/test/confs/4053
index 3a85deeab..10c31e255 100644
--- a/test/confs/4053
+++ b/test/confs/4053
@@ -18,6 +18,10 @@ dns_cname_loops = 9
 chunking_advertise_hosts = *
 tls_advertise_hosts =
 
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+
 pipelining_connect_advertise_hosts = *
 log_selector = +pipelining
 queue_only
diff --git a/test/confs/4056 b/test/confs/4056
index c77c439e4..f82434601 100644
--- a/test/confs/4056
+++ b/test/confs/4056
@@ -18,6 +18,10 @@ dns_cname_loops = 9
 chunking_advertise_hosts =
 tls_advertise_hosts =
 
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+
 pipelining_connect_advertise_hosts = *
 auth_advertise_hosts = *
 log_selector = +pipelining
diff --git a/test/confs/4058 b/test/confs/4058
index 887427a57..0502c55b2 100644
--- a/test/confs/4058
+++ b/test/confs/4058
@@ -21,6 +21,10 @@ dns_cname_loops = 9
 chunking_advertise_hosts = OPT
 tls_advertise_hosts =
 
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+
 pipelining_connect_advertise_hosts = *
 queue_only
 
diff --git a/test/confs/4060 b/test/confs/4060
index 30d65a146..191677073 100644
--- a/test/confs/4060
+++ b/test/confs/4060
@@ -23,6 +23,10 @@ chunking_advertise_hosts = OPT
 tls_advertise_hosts = *
 tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+
 # Avoid ECDHE key-exchange so that we can wireshark-decode (not TLS1.3)
 .ifdef _HAVE_GNUTLS
 tls_require_ciphers = NORMAL:-KX-ALL:+RSA
diff --git a/test/confs/4061 b/test/confs/4061
index 4352f5891..d929d53eb 100644
--- a/test/confs/4061
+++ b/test/confs/4061
@@ -27,6 +27,10 @@ tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 tls_require_ciphers = NORMAL:-KX-ALL:+RSA
 .endif
 
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+
 pipelining_connect_advertise_hosts = *
 log_selector = +received_recipients +pipelining
 queue_only
diff --git a/test/confs/4064 b/test/confs/4064
index 8c3c300a5..5a840a295 100644
--- a/test/confs/4064
+++ b/test/confs/4064
@@ -24,6 +24,10 @@ tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 tls_require_ciphers = NORMAL:-KX-ALL:+RSA
 .endif
 
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+
 pipelining_connect_advertise_hosts = *
 auth_advertise_hosts = *
 
diff --git a/test/confs/4065 b/test/confs/4065
index 8a8b38f96..92a17d71b 100644
--- a/test/confs/4065
+++ b/test/confs/4065
@@ -25,6 +25,10 @@ tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 tls_require_ciphers = NORMAL:-KX-ALL:+RSA
 .endif
 
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+
 pipelining_connect_advertise_hosts = *
 auth_advertise_hosts = *
 
diff --git a/test/confs/4650 b/test/confs/4650
index e6c788436..32e138313 100644
--- a/test/confs/4650
+++ b/test/confs/4650
@@ -1,6 +1,17 @@
 # Exim test configuration 4650
 
-.include DIR/aux-var/std_conf_prefix
+exim_path = EXIM_PATH
+keep_environment =
+host_lookup_order = bydns
+spool_directory = DIR/spool
+log_file_path = DIR/spool/log/SERVER%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+chunking_advertise_hosts = *
+tls_advertise_hosts =
+.ifdef _HAVE_PIPE_CONNECT
+pipelining_connect_advertise_hosts =
+.endif
 
 primary_hostname = myhost.test.ex
 
diff --git a/test/confs/5601 b/test/confs/5601
index 6e667b429..9b33101b3 100644
--- a/test/confs/5601
+++ b/test/confs/5601
@@ -13,6 +13,10 @@ gecos_name = CALLER_NAME
 chunking_advertise_hosts =
 primary_hostname = server1.example.com
 
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/5611 b/test/confs/5611
index 3309870a3..0b2be46a1 100644
--- a/test/confs/5611
+++ b/test/confs/5611
@@ -13,6 +13,10 @@ gecos_name = CALLER_NAME
 chunking_advertise_hosts =
 primary_hostname = server1.example.com
 
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+
 
 # ----- Main settings -----
 
diff --git a/test/confs/5740 b/test/confs/5740
index 4d41e820b..53302c507 100644
--- a/test/confs/5740
+++ b/test/confs/5740
@@ -13,6 +13,10 @@ gecos_name = CALLER_NAME
 chunking_advertise_hosts =
 primary_hostname = server1.example.com
 
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+
 
 # ----- Main settings -----