X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fconfs%2F2133;h=8fa51d0e911815d2ec400ac2ac22221fa1963683;hb=25f3b885dbfd1ba330521c8fe106876667a31bb7;hp=e05197980dd7cf1dc926138829ab50db263bdd70;hpb=7f3555b3d8e1fccfe8f5d450bdde367018a5e764;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/test/confs/2133 b/test/confs/2133
index e05197980..8fa51d0e9 100644
--- a/test/confs/2133
+++ b/test/confs/2133
@@ -1,15 +1,11 @@
-# Exim test configuration 2133
+# Exim test configuration 1162
 # TLS client: verify certificate from server - name-fails
 
 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
@@ -83,7 +81,7 @@ client_r:
 
 client_s:
   driver = accept
-  local_parts = users
+  local_parts = user_s
   retry_use_local_part
   transport = send_to_server_req_passname
 
@@ -93,7 +91,6 @@ client_t:
   retry_use_local_part
   transport = send_to_server_req_failcarryon
 
-
 # ----- Transports -----
 
 begin transports
@@ -103,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
 
@@ -115,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
 
@@ -128,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
 
@@ -143,6 +143,7 @@ send_to_server_req_fail:
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D
+  hosts_try_fastopen =	:
   tls_certificate = CERT2
   tls_privatekey = CERT2
 
@@ -156,6 +157,7 @@ send_to_server_req_failname:
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D
+  hosts_try_fastopen =	:
   tls_certificate = CERT2
   tls_privatekey = CERT2
 
@@ -170,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
 
@@ -177,11 +180,14 @@ send_to_server_req_passname:
   tls_verify_cert_hostnames = *
   tls_verify_hosts = *
 
+# this will fail to verify the cert name but carry on (try-verify mode)
+# fail because the cert is "server1.example.com" and the test system is something else
 send_to_server_req_failcarryon:
   driver = smtp
   allow_localhost
   hosts = HOSTNAME
   port = PORT_D
+  hosts_try_fastopen =	:
   tls_certificate = CERT2
   tls_privatekey = CERT2