X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/74954688e4f61475b2451b2cb22045ab8e7f0150..594db4c93b1f04ddb422ad86a188a4fdcb19c570:/test/confs/5608

diff --git a/test/confs/5608 b/test/confs/5608
index 500c54b6d..311cc1299 100644
--- a/test/confs/5608
+++ b/test/confs/5608
@@ -1,12 +1,11 @@
 # Exim test configuration 5608
-# OCSP stapling, client, tpda
+# OCSP stapling, client, events
 
 SERVER =
 
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = server1.example.com
-rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
@@ -55,7 +54,7 @@ check_data:
   accept
 
 logger:
-  accept condition = ${if !eq {msg} {${listextract{1}{$tpda_event}}}}
+  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}})
@@ -98,10 +97,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_event_action =		${acl {logger}}
+  event_action =		${acl {logger}}
 
 # norequire: request stapling but do not verify
 send_to_server2:
@@ -110,10 +110,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_event_action =		${acl {logger}}
+  event_action =		${acl {logger}}
 
 # (any other name): request and verify
 send_to_server3:
@@ -123,10 +124,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_event_action =		${acl {logger}}
+  event_action =		${acl {logger}}
 
 # (any other name): request and verify, ssl-on-connect
 send_to_server4:
@@ -136,11 +138,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_event_action =		${acl {logger}}
+  event_action =		${acl {logger}}
 
 
 # ----- Retry -----