X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/018058b21d17a988ed29cf31a7002da74b599d1a..01a4a5c5cbaa40ca618d3e233991ce183b551477:/test/confs/5608?ds=sidebyside

diff --git a/test/confs/5608 b/test/confs/5608
index 55d9a2015..6061a1343 100644
--- a/test/confs/5608
+++ b/test/confs/5608
@@ -1,5 +1,5 @@
-# Exim test configuration 5601
-# OCSP stapling, client, tpda
+# Exim test configuration 5608
+# OCSP stapling, client, events
 
 SERVER =
 
@@ -55,6 +55,7 @@ check_data:
   accept
 
 logger:
+  accept condition = ${if !eq {msg} {${listextract{1}{$event_name}}}}
   warn	logwrite = client ocsp status: $tls_out_ocsp \
     (${listextract {${eval:$tls_out_ocsp+1}} \
 		{notreq:notresp:vfynotdone:failed:verified}})
@@ -97,11 +98,11 @@ send_to_server1:
   hosts = HOSTIPV4
   port = PORT_D
   tls_verify_certificates =	DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
+  tls_verify_cert_hostnames =
   hosts_require_tls =	*
   hosts_request_ocsp =	:
   headers_add =			X-TLS-out: ocsp status $tls_out_ocsp
-  tpda_delivery_action =	${acl {logger}}
-  tpda_host_defer_action = 	${acl {logger}}
+  event_action =		${acl {logger}}
 
 # norequire: request stapling but do not verify
 send_to_server2:
@@ -110,11 +111,11 @@ send_to_server2:
   hosts = HOSTIPV4
   port = PORT_D
   tls_verify_certificates =	DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
+  tls_verify_cert_hostnames =
   hosts_require_tls =	*
 # note no ocsp mention here
   headers_add =			X-TLS-out: ocsp status $tls_out_ocsp
-  tpda_delivery_action =	${acl {logger}}
-  tpda_host_defer_action = 	${acl {logger}}
+  event_action =		${acl {logger}}
 
 # (any other name): request and verify
 send_to_server3:
@@ -124,11 +125,11 @@ send_to_server3:
   port = PORT_D
   helo_data = helo.data.changed
   tls_verify_certificates =	DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
+  tls_verify_cert_hostnames =
   hosts_require_tls =	*
   hosts_require_ocsp =	*
   headers_add =			X-TLS-out: ocsp status $tls_out_ocsp
-  tpda_delivery_action =	${acl {logger}}
-  tpda_host_defer_action = 	${acl {logger}}
+  event_action =		${acl {logger}}
 
 # (any other name): request and verify, ssl-on-connect
 send_to_server4:
@@ -138,12 +139,12 @@ send_to_server4:
   port = PORT_D
   helo_data = helo.data.changed
   tls_verify_certificates =	DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
+  tls_verify_cert_hostnames =
   protocol =           smtps
   hosts_require_tls =  *
   hosts_require_ocsp = *
   headers_add =			X-TLS-out: ocsp status $tls_out_ocsp
-  tpda_delivery_action =	${acl {logger}}
-  tpda_host_defer_action = 	${acl {logger}}
+  event_action =		${acl {logger}}
 
 
 # ----- Retry -----