X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/7f3555b3d8e1fccfe8f5d450bdde367018a5e764..7d2f2d360f5a8ac6e0055074db813c3c3cfbeeb4:/test/confs/2033

diff --git a/test/confs/2033 b/test/confs/2033
index ce5505180..15e632a57 100644
--- a/test/confs/2033
+++ b/test/confs/2033
@@ -3,13 +3,9 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-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
@@ -23,6 +19,8 @@ KEY2 =  FX/cert2
 
 # ----- Main settings -----
 
+disable_ipv6 = true
+
 acl_smtp_rcpt = accept
 
 log_selector =  +tls_peerdn+tls_certificate_verified
@@ -102,8 +100,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
 
@@ -114,8 +113,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 +127,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 +143,7 @@ send_to_server_req_fail:
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D
+  hosts_try_fastopen =	:
   tls_certificate = CERT2
   tls_privatekey = CERT2
 
@@ -155,6 +157,7 @@ send_to_server_req_failname:
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D
+  hosts_try_fastopen =	:
   tls_certificate = CERT2
   tls_privatekey = CERT2
 
@@ -169,6 +172,7 @@ send_to_server_req_passname:
   allow_localhost
   hosts = server1.example.com
   port = PORT_D
+  hosts_try_fastopen =	:
   tls_certificate = CERT2
   tls_privatekey = CERT2
 
@@ -183,6 +187,7 @@ send_to_server_req_failcarryon:
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D
+  hosts_try_fastopen =	:
   tls_certificate = CERT2
   tls_privatekey = CERT2