Merge from master into 4.next

[exim.git] / test / confs / 5420

diff --git a/test/confs/5420 b/test/confs/5420
index 2a7ebda1b8eebccbc8e16b4e71c15c6b6e64cc73..44a1fdee4ea3a93d09894d2baad701400af9324c 100644 (file)
--- a/test/confs/5420
+++ b/test/confs/5420
@@ -1,13 +1,8 @@
 # Exim test configuration 5420
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----