X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/d1af83598f7d6b32516a11bb28e569d592a05c48..e4a04f2a8de013abe125d9d04219343b0a32662e:/test/confs/2112?ds=inline

diff --git a/test/confs/2112 b/test/confs/2112
index 38283826d..2b3f33ed3 100644
--- a/test/confs/2112
+++ b/test/confs/2112
@@ -3,14 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 FX = DIR/aux-fixed
 S1 = FX/exim-ca/example.com/server1.example.com
@@ -84,7 +79,7 @@ client_r:
 
 client_s:
   driver = accept
-  local_parts = users
+  local_parts = user_s
   retry_use_local_part
   transport = send_to_server_req_passname
 
@@ -98,8 +93,9 @@ send_to_server_failcert:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
-  hosts_require_tls = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4
   tls_certificate = CERT2
   tls_privatekey = CERT2
 
@@ -112,8 +108,9 @@ send_to_server_retry:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4 : 127.0.0.1
-  hosts_require_tls = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4
   tls_certificate = CERT2
   tls_privatekey = CERT2
 
@@ -127,8 +124,9 @@ send_to_server_crypt:
   driver = smtp
   allow_localhost
   hosts = HOSTIPV4
-  hosts_require_tls = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen = :
+  hosts_require_tls = HOSTIPV4
   tls_certificate = CERT2
   tls_privatekey = CERT2
 
@@ -142,6 +140,7 @@ send_to_server_req_fail:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen = :
   tls_certificate = CERT2
   tls_privatekey = CERT2
 
@@ -155,6 +154,7 @@ send_to_server_req_failname:
    allow_localhost
    hosts = HOSTIPV4
    port = PORT_D
+  hosts_try_fastopen = :
    tls_certificate = CERT2
    tls_privatekey = CERT2
  
@@ -168,6 +168,7 @@ send_to_server_req_passname:
    allow_localhost
    hosts = HOSTIPV4
    port = PORT_D
+  hosts_try_fastopen = :
    tls_certificate = CERT2
    tls_privatekey = CERT2