Testsuite: more connect-time munge tweaking

[exim.git] / test / confs / 5840

diff --git a/test/confs/5840 b/test/confs/5840
index 10ca2111b25dbf938ef1e2801f73407461b1f784..1e6406eaa985d9bf642e246e37bc6105410eb06c 100644 (file)
--- a/test/confs/5840
+++ b/test/confs/5840
@@ -2,6 +2,7 @@
 # DANE/OpenSSL
 
 SERVER=
+CONTROL= *
 
 .include DIR/aux-var/tls_conf_prefix
 
@@ -15,34 +16,30 @@ acl_smtp_rcpt = accept logwrite = "rcpt ACL"
 acl_smtp_rcpt = accept verify = recipient/callout
 .endif
 
-log_selector =  +received_recipients +tls_peerdn +tls_certificate_verified
+log_selector =  +received_recipients +tls_peerdn +tls_certificate_verified \
+               +tls_sni
 
 queue_run_in_order
 
 tls_advertise_hosts = *
 
-# Set certificate only if server
 CDIR1 = DIR/aux-fixed/exim-ca/example.net/server1.example.net
 CDIR2 = DIR/aux-fixed/exim-ca/example.com/server1.example.com
 
 .ifdef CERT
 tls_certificate = CERT
 .else
-tls_certificate = ${if eq {SERVER}{server} \
-       {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}} {eq {DETAILS}{ee}}} \
+tls_certificate = ${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}} {eq {DETAILS}{ee}}} \
                {CDIR2/fullchain.pem}\
-               {CDIR1/fullchain.pem}}}\
-       fail}
+               {CDIR1/fullchain.pem}}
 .endif
 
 .ifdef ALLOW
 tls_privatekey = ALLOW
 .else
-tls_privatekey = ${if eq {SERVER}{server} \
-       {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}} {eq {DETAILS}{ee}}} \
+tls_privatekey = ${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}} {eq {DETAILS}{ee}}} \
                {CDIR2/server1.example.com.unlocked.key}\
-               {CDIR1/server1.example.net.unlocked.key}}}\
-       fail}
+               {CDIR1/server1.example.net.unlocked.key}}
 .endif
 
 # ----- Routers -----
@@ -69,13 +66,14 @@ begin transports
 send_to_server:
   driver = smtp
   allow_localhost
-  port = ${if match {$host}{\Ntest.ex$\N} {PORT_D}{25}}
+  port = PORT_D
+  hosts_try_fastopen = :
 
-  hosts_try_dane =     *
+  hosts_try_dane =     CONTROL
   hosts_require_dane = HOSTIPV4
   tls_verify_cert_hostnames = ${if eq {OPT}{no_certname} {}{*}}
   tls_try_verify_hosts = thishost.test.ex
-  tls_verify_certificates = CDIR2/ca_chain.pem
+  tls_verify_certificates = ${if eq {DETAILS}{ca} {CDIR2/ca_chain.pem} {}}