X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=test%2Fconfs%2F2012;h=f59b91a0c897790076d7316ab6cfd6f221d47b46;hb=5fbb51949cbd9765421c5832c2d391f80f8183e9;hp=6bc5487fffbc9edc4ef5790a8640bc933ff5b30a;hpb=44383db480a782c56a2195d46bea6df89e4cef3e;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/test/confs/2012 b/test/confs/2012
index 6bc5487ff..f59b91a0c 100644
--- a/test/confs/2012
+++ b/test/confs/2012
@@ -3,14 +3,9 @@
 
 SERVER=
 
-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/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 FX = DIR/aux-fixed
 S1 = FX/exim-ca/example.com/server1.example.com
@@ -98,12 +93,14 @@ 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
 
   tls_verify_certificates = CA2
+  tls_try_verify_hosts =
   tls_verify_cert_hostnames =
 
 # this will fail to verify the cert at HOSTIPV4 so fail the crypt, then retry on 127.1; ok
@@ -111,13 +108,15 @@ 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
 
   tls_verify_certificates = \
     ${if eq{$host_address}{127.0.0.1}{CA1}{CA2}}
+  tls_try_verify_hosts =
   tls_verify_cert_hostnames =
 
 # this will fail to verify the cert but continue unverified though crypted
@@ -125,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
 
@@ -140,6 +140,7 @@ send_to_server_req_fail:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen =	:
   tls_certificate = CERT2
   tls_privatekey = CERT2
 
@@ -153,6 +154,7 @@ send_to_server_req_fail:
    allow_localhost
    hosts = HOSTIPV4
    port = PORT_D
+  hosts_try_fastopen =	:
    tls_certificate = CERT2
    tls_privatekey = CERT2
  
@@ -166,6 +168,7 @@ send_to_server_req_fail:
    allow_localhost
    hosts = HOSTIPV4
    port = PORT_D
+  hosts_try_fastopen =	:
    tls_certificate = CERT2
    tls_privatekey = CERT2