summaryrefslogtreecommitdiff
path: root/test/aux-fixed
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2019-10-03 20:57:40 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2019-10-04 10:26:36 +0100
commit8e78571a8b7a823a439710720a407820ab662451 (patch)
tree0a89cb53a03dd035001ee8c38af065731d057f15 /test/aux-fixed
parent2f6c7b1aa0bf4a675d0ec95646b27f5c71bf06c2 (diff)
downloadexim4-8e78571a8b7a823a439710720a407820ab662451.tar.gz
Events: Add smtp:ehlo event
Diffstat (limited to 'test/aux-fixed')
-rw-r--r--test/aux-fixed/event-logger-acl12
1 files changed, 10 insertions, 2 deletions
diff --git a/test/aux-fixed/event-logger-acl b/test/aux-fixed/event-logger-acl
index 62cba32d6..980d47f11 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}}
@@ -64,6 +68,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 +79,4 @@ logger:
acl = ev_smtp
accept condition = ${if eq {msg} {${listextract{1}{$event_name}}}}
acl = ev_msg
+ accept logwrite = UNEXPECTED $event_name