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

[exim.git] / test / confs / 0611

diff --git a/test/confs/0611 b/test/confs/0611
index ddd882462a60e5297b4039ad24f6f51f297a8948..d3e0a47b21bd4c8c28deb7f00cda3ae553259a37 100644 (file)
--- a/test/confs/0611
+++ b/test/confs/0611
@@ -4,16 +4,23 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 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
+
 qualify_domain = test.ex
 queue_run_in_order
 log_selector = +received_recipients