Refactor common uses of list-checking

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

diff --git a/test/confs/5658 b/test/confs/5658
index e8f2494f630fad6849e77c23b30568357521454e..7ab2de68ffe47cf75ce987afaef9df0e9cdf0072 100644 (file)
--- a/test/confs/5658
+++ b/test/confs/5658
@@ -1,5 +1,5 @@
 # Exim test configuration 5658
-# OCSP stapling, client, tpda
+# OCSP stapling, client, events
 
 SERVER =
 
@@ -52,6 +52,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}})
@@ -99,8 +100,7 @@ send_to_server1:
   headers_add = X-TLS-out: OCSP status $tls_out_ocsp \
     (${listextract {${eval:$tls_out_ocsp+1}} \
                {notreq:notresp:vfynotdone:failed:verified}})
-  tpda_delivery_action =       ${acl {logger}}
-  tpda_host_defer_action =     ${acl {logger}}
+  event_action =       ${acl {logger}}
 
 send_to_server2:
   driver = smtp
@@ -113,8 +113,7 @@ send_to_server2:
   headers_add = X-TLS-out: OCSP status $tls_out_ocsp \
     (${listextract {${eval:$tls_out_ocsp+1}} \
                {notreq:notresp:vfynotdone:failed:verified}})
-  tpda_delivery_action =       ${acl {logger}}
-  tpda_host_defer_action =     ${acl {logger}}
+  event_action =       ${acl {logger}}
 
 send_to_server3:
   driver = smtp
@@ -129,8 +128,7 @@ send_to_server3:
   headers_add = X-TLS-out: OCSP status $tls_out_ocsp \
     (${listextract {${eval:$tls_out_ocsp+1}} \
                {notreq:notresp:vfynotdone:failed:verified}})
-  tpda_delivery_action =       ${acl {logger}}
-  tpda_host_defer_action =     ${acl {logger}}
+  event_action =       ${acl {logger}}
 
 send_to_server4:
   driver = smtp
@@ -146,8 +144,7 @@ send_to_server4:
   headers_add = X-TLS-out: OCSP status $tls_out_ocsp \
     (${listextract {${eval:$tls_out_ocsp+1}} \
                {notreq:notresp:vfynotdone:failed:verified}})
-  tpda_delivery_action =       ${acl {logger}}
-  tpda_host_defer_action =     ${acl {logger}}
+  event_action =       ${acl {logger}}
 
 
 # ----- Retry -----