Refactor common uses of list-checking

[users/jgh/exim.git] / test / confs / 5608

diff --git a/test/confs/5608 b/test/confs/5608
index 500c54b6de68ecd2453be1b5994a8b4ffb744a27..da0f6707f77cb193d17c9085fb453089354dce95 100644 (file)
--- a/test/confs/5608
+++ b/test/confs/5608
@@ -1,5 +1,5 @@
 # Exim test configuration 5608
-# OCSP stapling, client, tpda
+# OCSP stapling, client, events
 
 SERVER =
 
@@ -55,7 +55,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}})
@@ -101,7 +101,7 @@ send_to_server1:
   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:
@@ -113,7 +113,7 @@ send_to_server2:
   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:
@@ -126,7 +126,7 @@ send_to_server3:
   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:
@@ -140,7 +140,7 @@ send_to_server4:
   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 -----