update to pre-4.87 master

[exim.git] / test / confs / 5840

diff --git a/test/confs/5840 b/test/confs/5840
index e1c63f435b3113487e054ad088f41210dcee23c4..4f468a3843c9c6e4178ab81e20a3084f0146e346 100644 (file)
--- a/test/confs/5840
+++ b/test/confs/5840
@@ -13,11 +13,14 @@ gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
+.ifndef OPT
 acl_smtp_rcpt = accept
+.else
+acl_smtp_rcpt = accept verify = recipient/callout
+.endif
 
 log_selector =  +received_recipients +tls_peerdn +tls_certificate_verified
 
-queue_only
 queue_run_in_order
 
 tls_advertise_hosts = *
@@ -27,18 +30,17 @@ CDIR1 = DIR/aux-fixed
 CDIR2 = DIR/aux-fixed/exim-ca/example.com/server1.example.com
 
 tls_certificate = ${if eq {SERVER}{server} \
-       {${if eq {DETAILS}{ta} \
+       {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}}} \
                {CDIR2/fullchain.pem}\
                {CDIR1/cert1}}}\
        fail}
 
 tls_privatekey = ${if eq {SERVER}{server} \
-       {${if eq {DETAILS}{ta} \
+       {${if or {{eq {DETAILS}{ta}} {eq {DETAILS}{ca}}} \
                {CDIR2/server1.example.com.unlocked.key}\
                {CDIR1/cert1}}}\
        fail}
 
-
 # ----- Routers -----
 
 begin routers
@@ -64,11 +66,12 @@ send_to_server:
   allow_localhost
   port = PORT_D
 
-#  hosts_try_dane = *
-  hosts_require_dane = *
-  hosts_request_ocsp = ${if or { {= {4}{$tls_out_tlsa_usage}} \
-                                {= {0}{$tls_out_tlsa_usage}} } \
-                        {*}{}}
+  hosts_try_dane =     *
+  hosts_require_dane = !thishost.test.ex
+  tls_verify_cert_hostnames = ${if eq {OPT}{no_certname} {}{*}}
+  tls_try_verify_hosts = thishost.test.ex
+  tls_verify_certificates = CDIR2/ca_chain.pem
+
 
 
 # ----- Retry -----