Taint: fix off-by-one in is_tainted(). Bug 2634

[users/heiko/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 62cba32d633b1415bc780dc9c31aa04cbdcb2aaa..15321724efb62f7fa442ae513186c468a536850c 100644 (file)
--- 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,6 +72,9 @@ 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
+
 logger:
     warn   logwrite = event $event_name
     accept condition = ${if eq {tcp} {${listextract{1}{$event_name}}}}
@@ -72,3 +83,4 @@ logger:
           acl = ev_smtp
     accept condition = ${if eq {msg} {${listextract{1}{$event_name}}}}
           acl = ev_msg
+    accept logwrite =  UNEXPECTED $event_name