X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/430f98cb1e35e925f6b3ca54375411ff67e8895b..921dfc1193791b722844341c3ec97be158042c17:/test/confs/5700

diff --git a/test/confs/5700 b/test/confs/5700
index 0e9fd1d3f..4d0abea55 100644
--- a/test/confs/5700
+++ b/test/confs/5700
@@ -2,7 +2,6 @@
 
 exim_path = EXIM_PATH
 host_lookup_order = bydns
-rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
@@ -13,7 +12,7 @@ gecos_name = CALLER_NAME
 acl_smtp_rcpt = accept
 acl_smtp_data = accept
 
-delivery_event_action = ${acl {logger}}
+event_action = ${acl {logger}}
 
 
 # ----- ACL -----
@@ -21,9 +20,9 @@ delivery_event_action = ${acl {logger}}
 begin acl
 
 ev_tcp:
-    accept condition = ${if eq {$tpda_event}{tcp:connect}}
+    accept condition = ${if eq {$event_name}{tcp:connect}}
 	   logwrite = . [$host_address]:$host_port
-    accept condition = ${if eq {$tpda_event}{tcp:close}}
+    accept condition = ${if eq {$event_name}{tcp:close}}
 	   logwrite = . [$sending_ip_address] -> \
 			[$host_address]:$host_port
     accept
@@ -32,10 +31,10 @@ ev_smtp:
     accept
 	   logwrite = . [$sending_ip_address] -> \
 			[$host_address]:$host_port
-	   logwrite = . banner <$tpda_data>
+	   logwrite = . banner <$event_data>
 
 ev_msg_fail:
-    accept condition = ${if eq {$tpda_event}{msg:fail:delivery}}
+    accept condition = ${if eq {$event_name}{msg:fail:delivery}}
 	   logwrite = . \
 	    refused by fdqn <$host> \
 	    local_part <$local_part> \
@@ -44,19 +43,19 @@ ev_msg_fail:
     accept logwrite = . \
 	    local_part <$local_part> \
 	    domain <$domain> \
-	    reason <$tpda_data>
+	    reason <$event_data>
 
 ev_msg:
-    accept condition = ${if eq {fail} {${listextract{2}{$tpda_event}}}}
+    accept condition = ${if eq {fail} {${listextract{2}{$event_name}}}}
 	   acl = ev_msg_fail
 
-    accept condition = ${if eq {$tpda_event}{msg:complete}}
+    accept condition = ${if eq {$event_name}{msg:complete}}
 	   logwrite = . finished: $message_exim_id
 
     accept condition = ${if !eq {$domain}{domain1}}
 	   logwrite = $this_expansion_will_fail
 
-    accept condition = ${if eq {$tpda_event}{msg:delivery}}
+    accept condition = ${if eq {$event_name}{msg:delivery}}
 	   logwrite = . \
 	    delivery \
 	    ip <$host_address> \
@@ -64,11 +63,11 @@ ev_msg:
 	    fqdn <$host> \
 	    local_part <$local_part> \
 	    domain <$domain> \
-	    confirmation <$tpda_data> \
+	    confirmation <$event_data> \
 	    router <$router_name> \
 	    transport <$transport_name>
 
-    accept condition = ${if eq {$tpda_event}{msg:host:defer}}
+    accept condition = ${if eq {$event_name}{msg:host:defer}}
 	   logwrite = . \
 	    deferral \
 	    ip <$host_address> \
@@ -76,18 +75,18 @@ ev_msg:
 	    fqdn <$host> \
 	    local_part <$local_part> \
 	    domain <$domain> \
-	    errno <$tpda_defer_errno> \
-	    errstr <$tpda_data> \
+	    errno <$event_defer_errno> \
+	    errstr <$event_data> \
 	    router <$router_name> \
 	    transport <$transport_name>
 
 logger:
-    warn   logwrite = event $tpda_event
-    accept condition = ${if eq {tcp} {${listextract{1}{$tpda_event}}}}
+    warn   logwrite = event $event_name
+    accept condition = ${if eq {tcp} {${listextract{1}{$event_name}}}}
 	   acl = ev_tcp
-    accept condition = ${if eq {smtp} {${listextract{1}{$tpda_event}}}}
+    accept condition = ${if eq {smtp} {${listextract{1}{$event_name}}}}
 	   acl = ev_smtp
-    accept condition = ${if eq {msg} {${listextract{1}{$tpda_event}}}}
+    accept condition = ${if eq {msg} {${listextract{1}{$event_name}}}}
 	   acl = ev_msg
 
 
@@ -117,6 +116,6 @@ smtp:
   port = PORT_S
   command_timeout = 1s
   final_timeout = 1s
-  tpda_event_action =   ${acl {logger}}
+  event_action =   ${acl {logger}}
 
 # End