Merge from master into 4.next

[exim.git] / test / confs / 5420

diff --git a/test/confs/5420 b/test/confs/5420
index aff16fad4b6a3467de7fb64152a66c9a0fc1a8e7..44a1fdee4ea3a93d09894d2baad701400af9324c 100644 (file)
--- a/test/confs/5420
+++ b/test/confs/5420
@@ -1,13 +1,8 @@
-# Exim test configuration 5402
+# Exim test configuration 5420
+
+.include DIR/aux-var/tls_conf_prefix
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
 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 -----
 
@@ -52,7 +47,8 @@ smtp:
   driver = smtp
   interface = HOSTIPV4
   port = PORT_D
-  hosts_avoid_tls = ${if eq {$address_data}{usery}{*}{:}}
+  hosts_avoid_tls =        ${if eq {$address_data}{usery}{*}{:}}
+  hosts_verify_avoid_tls = ${if eq {$address_data}{userz}{*}{:}}
 
 
 # End