X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=test%2Fconfs%2F5840;h=4f468a3843c9c6e4178ab81e20a3084f0146e346;hb=6a11a9e618a72b8d96aecb2ad9aa300b98f8d991;hp=68a47e99826dc5fc4c11823a5d8609c5c499c943;hpb=37ff4e03734cf28bf78c6df892489f99e50d8356;p=exim.git

diff --git a/test/confs/5840 b/test/confs/5840
index 68a47e998..4f468a384 100644
--- a/test/confs/5840
+++ b/test/confs/5840
@@ -6,7 +6,6 @@ SERVER=
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
@@ -14,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 = *
@@ -28,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
@@ -65,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 -----