X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/44383db480a782c56a2195d46bea6df89e4cef3e..86ba540670517109809d93cd73716d320a6a0923:/test/confs/2112?ds=inline

diff --git a/test/confs/2112 b/test/confs/2112
index 2c81e0cf3..4ec0b4fcd 100644
--- a/test/confs/2112
+++ b/test/confs/2112
@@ -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
@@ -26,7 +21,7 @@ KEY2 =  FX/cert2
 
 acl_smtp_rcpt = accept
 
-log_selector =  +tls_peerdn+tls_certificate_verified
+log_selector =  +tls_peerdn+tls_certificate_verified +received_recipients
 
 queue_only
 queue_run_in_order
@@ -84,10 +79,22 @@ client_r:
 
 client_s:
   driver = accept
-  local_parts = users
+  local_parts = user_s
   retry_use_local_part
   transport = send_to_server_req_passname
 
+client_t:
+  driver = accept
+  local_parts = usert
+  retry_use_local_part
+  transport = send_to_server_req_failchain
+
+client_u:
+  driver = accept
+  local_parts = useru
+  retry_use_local_part
+  transport = send_to_server_req_passchain
+
 
 # ----- Transports -----
 
@@ -98,12 +105,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 +120,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 +136,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 +152,7 @@ send_to_server_req_fail:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
+  hosts_try_fastopen = :
   tls_certificate = CERT2
   tls_privatekey = CERT2
 
@@ -147,30 +160,60 @@ send_to_server_req_fail:
   tls_verify_hosts = *
   tls_verify_cert_hostnames =
 
- # this will fail to verify the cert name and fallback to unencrypted
- send_to_server_req_failname:
-   driver = smtp
+# this will fail to verify the cert name and fallback to unencrypted
+send_to_server_req_failname:
+   driver =		smtp
    allow_localhost
-   hosts = HOSTIPV4
-   port = PORT_D
-   tls_certificate = CERT2
-   tls_privatekey = CERT2
+   hosts =		serverbadname.example.com
+   port =		PORT_D
+  hosts_try_fastopen =	:
+   tls_certificate =	CERT2
+   tls_privatekey =	CERT2
  
-   tls_verify_certificates = CA1
-   tls_verify_cert_hostnames = server1.example.net : server1.example.org
-   tls_verify_hosts = *
+   tls_verify_certificates =	CA1
+   tls_verify_cert_hostnames =	HOSTIPV4
+   tls_verify_hosts =		*
  
- # this will pass the cert verify including name check
- send_to_server_req_passname:
-   driver = smtp
+# this will pass the cert verify including name check
+send_to_server_req_passname:
+   driver =		smtp
    allow_localhost
-   hosts = HOSTIPV4
-   port = PORT_D
-   tls_certificate = CERT2
-   tls_privatekey = CERT2
+   hosts =		server1.example.com
+   port =		PORT_D
+  hosts_try_fastopen =	:
+   tls_certificate =	CERT2
+   tls_privatekey =	CERT2
  
-   tls_verify_certificates = CA1
-   tls_verify_cert_hostnames = noway.example.com : server1.example.com
-   tls_verify_hosts = *
+   tls_verify_certificates =	CA1
+   tls_verify_cert_hostnames =	HOSTIPV4
+   tls_verify_hosts =		*
+
+ # this will fail the cert verify name check, because CNAME rules
+ send_to_server_req_failchain:
+   driver =		smtp
+   allow_localhost
+   hosts =		serverchain1.example.com
+   port =		PORT_D
+   hosts_try_fastopen =	:
+   tls_certificate =	CERT2
+   tls_privatekey =	CERT2
+ 
+   tls_verify_certificates =	CA1
+   tls_verify_cert_hostnames =	HOSTIPV4
+   tls_verify_hosts =		*
+
+ # this will pass the cert verify name check, because CNAME rules
+ send_to_server_req_passchain:
+   driver =		smtp
+   allow_localhost
+   hosts =		alternatename.server1.example.com
+   port =		PORT_D
+   hosts_try_fastopen =	:
+   tls_certificate =	CERT2
+   tls_privatekey =	CERT2
+
+   tls_verify_certificates =	CA1
+   tls_verify_cert_hostnames =	HOSTIPV4
+   tls_verify_hosts =		*
 
 # End