Merge branch 'master' into 4.next

[exim.git] / test / confs / 2126

diff --git a/test/confs/2126 b/test/confs/2126
index 0cfdbba66bc8f176d0400408e7b23efd5dd5b250..9f0af7cf6e1d702f5ca7e9f0d351d2b8888c4550 100644 (file)
--- a/test/confs/2126
+++ b/test/confs/2126
@@ -2,14 +2,9 @@
 
 SERVER=
 
 
 SERVER=
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -31,7 +26,7 @@ check_rcpt:
   defer   local_parts = usery
           hosts       = 127.0.0.1
 
   defer   local_parts = usery
           hosts       = 127.0.0.1
 

-  accept
+  accept  delay       = 1s

 
 
 # ----- Routers -----
 
 
 # ----- Routers -----


@@ -57,6 +52,7 @@ t1:
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_D
   allow_localhost
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_D
   allow_localhost

+  tls_try_verify_hosts = :

 
 t2:
   driver = appendfile
 
 t2:
   driver = appendfile