X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/401a89359e1fcff59218ae2a05a5e9f3a603d915..f652fa8083925080b92b02897f1ee872ff2d3bba:/test/confs/5850?ds=inline

diff --git a/test/confs/5850 b/test/confs/5850
index cd4ccc59f..c381ef616 100644
--- a/test/confs/5850
+++ b/test/confs/5850
@@ -16,7 +16,7 @@ gecos_name = CALLER_NAME
 
 acl_smtp_rcpt = accept
 
-log_selector =  +tls_peerdn
+log_selector =  +received_recipients +tls_peerdn +tls_certificate_verified
 
 queue_only
 queue_run_in_order
@@ -24,9 +24,20 @@ queue_run_in_order
 tls_advertise_hosts = *
 
 # Set certificate only if server
+CDIR1 = DIR/aux-fixed
+CDIR2 = DIR/aux-fixed/exim-ca/example.com/server1.example.com
 
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-#tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+tls_certificate = ${if eq {SERVER}{server} \
+	{${if eq {DETAILS}{ta} \
+		{CDIR2/fullchain.pem}\
+		{CDIR1/cert1}}}\
+	fail}
+
+tls_privatekey = ${if eq {SERVER}{server} \
+	{${if eq {DETAILS}{ta} \
+		{CDIR2/server1.example.com.unlocked.key}\
+		{CDIR1/cert1}}}\
+	fail}
 
 
 # ----- Routers -----
@@ -35,7 +46,7 @@ begin routers
 
 client:
   driver = dnslookup
-  condition = ${if eq {SERVER}{server}{no}{yes}}
+  condition = ${if eq {SERVER}{}}
   dnssec_request_domains = *
   self = send
   transport = send_to_server