X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/8e78571a8b7a823a439710720a407820ab662451..6fc54bd18aa7a51e11dce5a905e754cedb526230:/test/aux-fixed/event-logger-acl

diff --git a/test/aux-fixed/event-logger-acl b/test/aux-fixed/event-logger-acl
index 980d47f11..3959304a2 100644
--- a/test/aux-fixed/event-logger-acl
+++ b/test/aux-fixed/event-logger-acl
@@ -54,6 +54,10 @@ ev_msg:
     accept condition = ${if eq {$event_name}{msg:delivery}}
 	   acl = ev_msg_log delivery "confirmation <$event_data>"
 
+    accept condition = ${if eq {$event_name}{msg:defer}}
+	   acl = ev_msg_log "message deferral" \
+			"errno <$event_defer_errno> errstr <$event_data>"
+
     accept condition = ${if eq {$event_name}{msg:host:defer}}
 	   acl = ev_msg_log "host deferral" \
 			"errno <$event_defer_errno> errstr <$event_data>"
@@ -71,12 +75,19 @@ ev_msg:
     accept condition = ${if eq {$event_name}{msg:rcpt:host:defer}}
     accept logwrite =	UNEXPECTED $event_name
 
+ev_auth:
+    accept condition = ${if eq {$event_name}{auth:fail}}
+	   logwrite = . \
+		      "auth fail" \
+		      event_data <$event_data> \
+		      sender_host_authenticated <$sender_host_authenticated> \
+		      authenticated_fail_id <$authenticated_fail_id>
+
+    accept logwrite =	UNEXPECTED $event_name
+
 logger:
     warn   logwrite = event $event_name
-    accept condition = ${if eq {tcp} {${listextract{1}{$event_name}}}}
-	   acl = ev_tcp
-    accept condition = ${if eq {smtp} {${listextract{1}{$event_name}}}}
-	   acl = ev_smtp
-    accept condition = ${if eq {msg} {${listextract{1}{$event_name}}}}
-	   acl = ev_msg
+	   set acl_m1 = ${listextract{1}{$event_name}}
+    accept condition =	${if inlist{$acl_m1}{tcp:smtp:msg:auth}}
+	   acl =	ev_$acl_m1
     accept logwrite =	UNEXPECTED $event_name