git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More regular logging use of H=<name> [<ip>]
[exim.git]
/
test
/
confs
/
5700
diff --git
a/test/confs/5700
b/test/confs/5700
index 0856bb05622e33b234982b686daca4a606ee9f26..0e9fd1d3f105179a21829e1f6b3053d0f74e0d05 100644
(file)
--- a/
test/confs/5700
+++ b/
test/confs/5700
@@
-13,6
+13,8
@@
gecos_name = CALLER_NAME
acl_smtp_rcpt = accept
acl_smtp_data = accept
acl_smtp_rcpt = accept
acl_smtp_data = accept
+delivery_event_action = ${acl {logger}}
+
# ----- ACL -----
# ----- ACL -----
@@
-20,7
+22,7
@@
begin acl
ev_tcp:
accept condition = ${if eq {$tpda_event}{tcp:connect}}
ev_tcp:
accept condition = ${if eq {$tpda_event}{tcp:connect}}
- logwrite = . [$host_address]:$
sending
_port
+ logwrite = . [$host_address]:$
host
_port
accept condition = ${if eq {$tpda_event}{tcp:close}}
logwrite = . [$sending_ip_address] -> \
[$host_address]:$host_port
accept condition = ${if eq {$tpda_event}{tcp:close}}
logwrite = . [$sending_ip_address] -> \
[$host_address]:$host_port
@@
-32,11
+34,29
@@
ev_smtp:
[$host_address]:$host_port
logwrite = . banner <$tpda_data>
[$host_address]:$host_port
logwrite = . banner <$tpda_data>
+ev_msg_fail:
+ accept condition = ${if eq {$tpda_event}{msg:fail:delivery}}
+ logwrite = . \
+ refused by fdqn <$host> \
+ local_part <$local_part> \
+ domain <$domain> \
+
+ accept logwrite = . \
+ local_part <$local_part> \
+ domain <$domain> \
+ reason <$tpda_data>
+
ev_msg:
ev_msg:
- accept condition = ${if !eq {$acl_arg2}{domain1}}
+ accept condition = ${if eq {fail} {${listextract{2}{$tpda_event}}}}
+ acl = ev_msg_fail
+
+ accept condition = ${if eq {$tpda_event}{msg:complete}}
+ logwrite = . finished: $message_exim_id
+
+ accept condition = ${if !eq {$domain}{domain1}}
logwrite = $this_expansion_will_fail
logwrite = $this_expansion_will_fail
- accept condition = ${if eq {$
acl_arg1
}{msg:delivery}}
+ accept condition = ${if eq {$
tpda_event
}{msg:delivery}}
logwrite = . \
delivery \
ip <$host_address> \
logwrite = . \
delivery \
ip <$host_address> \
@@
-48,7
+68,7
@@
ev_msg:
router <$router_name> \
transport <$transport_name>
router <$router_name> \
transport <$transport_name>
- accept condition = ${if eq {$
acl_arg1
}{msg:host:defer}}
+ accept condition = ${if eq {$
tpda_event
}{msg:host:defer}}
logwrite = . \
deferral \
ip <$host_address> \
logwrite = . \
deferral \
ip <$host_address> \
@@
-68,7
+88,7
@@
logger:
accept condition = ${if eq {smtp} {${listextract{1}{$tpda_event}}}}
acl = ev_smtp
accept condition = ${if eq {msg} {${listextract{1}{$tpda_event}}}}
accept condition = ${if eq {smtp} {${listextract{1}{$tpda_event}}}}
acl = ev_smtp
accept condition = ${if eq {msg} {${listextract{1}{$tpda_event}}}}
- acl = ev_msg
$tpda_event $acl_arg2
+ acl = ev_msg
# ----- Routers -----
# ----- Routers -----
@@
-97,6
+117,6
@@
smtp:
port = PORT_S
command_timeout = 1s
final_timeout = 1s
port = PORT_S
command_timeout = 1s
final_timeout = 1s
- tpda_event_action = ${acl {logger}
{$tpda_event} {$domain}
}
+ tpda_event_action = ${acl {logger}}
# End
# End