X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0b969c4b8f7139537224878fb6159e4c98e81234..0f06b4f296802e4e13188c740ea09419931a3020:/test/confs/5700

diff --git a/test/confs/5700 b/test/confs/5700
index 52b28018a..0e9fd1d3f 100644
--- a/test/confs/5700
+++ b/test/confs/5700
@@ -13,27 +13,83 @@ gecos_name = CALLER_NAME
 acl_smtp_rcpt = accept
 acl_smtp_data = accept
 
+delivery_event_action = ${acl {logger}}
+
 
 # ----- ACL -----
 
 begin acl
 
-logger:
-    accept condition = ${if eq {$acl_arg2}{domain1}}
-	   logwrite = \
-	    $acl_arg1 \
-	    ip <$tpda_delivery_ip> \
-	    port <$tpda_delivery_port> \
-	    fqdn <$tpda_delivery_fqdn> \
-	    local_part <$tpda_delivery_local_part> \
-	    domain <$tpda_delivery_domain> \
-	    confirmation <$tpda_delivery_confirmation> \
+ev_tcp:
+    accept condition = ${if eq {$tpda_event}{tcp:connect}}
+	   logwrite = . [$host_address]:$host_port
+    accept condition = ${if eq {$tpda_event}{tcp:close}}
+	   logwrite = . [$sending_ip_address] -> \
+			[$host_address]:$host_port
+    accept
+
+ev_smtp:
+    accept
+	   logwrite = . [$sending_ip_address] -> \
+			[$host_address]:$host_port
+	   logwrite = . banner <$tpda_data>
+
+ev_msg_fail:
+    accept condition = ${if eq {$tpda_event}{msg:fail:delivery}}
+	   logwrite = . \
+	    refused by fdqn <$host> \
+	    local_part <$local_part> \
+	    domain <$domain> \
+
+    accept logwrite = . \
+	    local_part <$local_part> \
+	    domain <$domain> \
+	    reason <$tpda_data>
+
+ev_msg:
+    accept condition = ${if eq {fail} {${listextract{2}{$tpda_event}}}}
+	   acl = ev_msg_fail
+
+    accept condition = ${if eq {$tpda_event}{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}}
+	   logwrite = . \
+	    delivery \
+	    ip <$host_address> \
+	    port <$host_port> \
+	    fqdn <$host> \
+	    local_part <$local_part> \
+	    domain <$domain> \
+	    confirmation <$tpda_data> \
+	    router <$router_name> \
+	    transport <$transport_name>
+
+    accept condition = ${if eq {$tpda_event}{msg:host:defer}}
+	   logwrite = . \
+	    deferral \
+	    ip <$host_address> \
+	    port <$host_port> \
+	    fqdn <$host> \
+	    local_part <$local_part> \
+	    domain <$domain> \
 	    errno <$tpda_defer_errno> \
-	    errstr <$tpda_defer_errstr> \
+	    errstr <$tpda_data> \
 	    router <$router_name> \
 	    transport <$transport_name>
 
-    accept logwrite = $this_expansion_will_fail
+logger:
+    warn   logwrite = event $tpda_event
+    accept condition = ${if eq {tcp} {${listextract{1}{$tpda_event}}}}
+	   acl = ev_tcp
+    accept condition = ${if eq {smtp} {${listextract{1}{$tpda_event}}}}
+	   acl = ev_smtp
+    accept condition = ${if eq {msg} {${listextract{1}{$tpda_event}}}}
+	   acl = ev_msg
+
 
 # ----- Routers -----
 
@@ -61,7 +117,6 @@ smtp:
   port = PORT_S
   command_timeout = 1s
   final_timeout = 1s
-  tpda_delivery_action =   ${acl {logger} {delivery} {$domain} }
-  tpda_host_defer_action = ${acl {logger} {deferral} {$domain} }
+  tpda_event_action =   ${acl {logger}}
 
 # End