Rename facility to Event Actions, ifdeffed on EXPERIMENTAL_EVENT

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

diff --git a/test/confs/5750 b/test/confs/5750
index bcb03ac5daae4c52e495afef7c84f863fe5f3f4e..8cfef31531dcd6a52caf6b1726c10ac364e80e29 100644 (file)
--- a/test/confs/5750
+++ b/test/confs/5750
@@ -34,7 +34,7 @@ tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server2.example.com/
 begin acl
 
 ev_tls:
 begin acl
 
 ev_tls:

-  accept logwrite =  $tpda_event depth=$tpda_data \
+  accept logwrite =  $event_name depth=$event_data \

                        <${certextract {subject} {$tls_out_peercert}}>
 #       message = noooo
 
                        <${certextract {subject} {$tls_out_peercert}}>
 #       message = noooo
 


@@ -58,9 +58,9 @@ ev_msg:
         logwrite =       ${certextract {crl_uri}       {$tls_out_peercert} {CRU <$value>}{(no CRU)}}
 
 logger:
         logwrite =       ${certextract {crl_uri}       {$tls_out_peercert} {CRU <$value>}{(no CRU)}}
 
 logger:

-  accept condition = ${if eq {msg} {${listextract{1}{$tpda_event}}}}
-        acl = ev_msg $tpda_event $acl_arg2
-  accept condition = ${if eq {tls} {${listextract{1}{$tpda_event}}}}
+  accept condition = ${if eq {msg} {${listextract{1}{$event_name}}}}
+        acl = ev_msg $event_name $acl_arg2
+  accept condition = ${if eq {tls} {${listextract{1}{$event_name}}}}

         message =   ${acl {ev_tls}}
   accept
 
         message =   ${acl {ev_tls}}
   accept
 


@@ -93,7 +93,7 @@ send_to_server:
 {example.com/server1.example.com/ca_chain.pem}\
 {example.net/server1.example.net/ca_chain.pem}}
 
 {example.com/server1.example.com/ca_chain.pem}\
 {example.net/server1.example.net/ca_chain.pem}}
 

-  tpda_event_action =   ${acl {logger} {$tpda_event} {$domain} }
+  event_action =   ${acl {logger} {$event_name} {$domain} }

 
 # ----- Retry -----
 
 
 # ----- Retry -----