Avoid sending DSN when message was accepted under fakereject or fakedefer. Bug 3016

[exim.git] / test / aux-fixed / event-logger-acl

diff --git a/test/aux-fixed/event-logger-acl b/test/aux-fixed/event-logger-acl
index 15321724efb62f7fa442ae513186c468a536850c..3959304a2202a1a48888393a1e73400c3af7cb56 100644 (file)
--- a/test/aux-fixed/event-logger-acl
+++ b/test/aux-fixed/event-logger-acl
@@ -75,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