X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/ffbc20ed9c9ed09a68ff0a608f623c3c83d521a8..b371572e89e8ca593b8d6bb5c919fedbb67b2eeb:/test/aux-fixed/event-logger-acl

diff --git a/test/aux-fixed/event-logger-acl b/test/aux-fixed/event-logger-acl
index 62cba32d6..3959304a2 100644
--- a/test/aux-fixed/event-logger-acl
+++ b/test/aux-fixed/event-logger-acl
@@ -4,13 +4,17 @@ ev_tcp:
     accept condition = ${if eq {$event_name}{tcp:close}}
 	   logwrite = . [$sending_ip_address] -> \
 			[$host_address]:$host_port
-    accept
+    accept logwrite =	UNEXPECTED $event_name
 
 ev_smtp:
-    accept
+    warn
 	   logwrite = . [$sending_ip_address] -> \
 			[$host_address]:$host_port
+    accept condition = ${if eq {$event_name}{smtp:connect}}
 	   logwrite = . banner <$event_data>
+    accept condition = ${if eq {$event_name}{smtp:ehlo}}
+	   logwrite = . ehlo-resp <$event_data>
+    accept logwrite =	UNEXPECTED $event_name
 
 ev_msg_fail:
     accept condition = ${if eq {$event_name}{msg:fail:delivery}}
@@ -50,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>"
@@ -64,11 +72,22 @@ ev_msg:
 			"err <$event_defer_errno>:<$acl_m_ev_lkup:$acl_m_ev_code> \
 			errstr <$event_data>"
 
+    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