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
Fix logging of drop-after-EHLO-reject.
[exim.git]
/
test
/
stderr
/
0021
diff --git
a/test/stderr/0021
b/test/stderr/0021
index 4f43e05c92f22a4c2e4addb3099492eaca6e0500..4be6c99c5a399f14f7e3248b87463a4ea0b29b07 100644
(file)
--- a/
test/stderr/0021
+++ b/
test/stderr/0021
@@
-18,6
+18,7
@@
check hosts = : 10.9.8.7
host in ": 10.9.8.7"? no (end of list)
deny: condition test failed in ACL "connect"
processing "drop"
host in ": 10.9.8.7"? no (end of list)
deny: condition test failed in ACL "connect"
processing "drop"
+l_message: forcibly dropped
check hosts = 10.9.8.9
host in "10.9.8.9"? no (end of list)
drop: condition test failed in ACL "connect"
check hosts = 10.9.8.9
host in "10.9.8.9"? no (end of list)
drop: condition test failed in ACL "connect"
@@
-27,8
+28,10
@@
check logwrite = $sender_host_address accepted by connect ACL
LOG: MAIN
10.9.8.8 accepted by connect ACL
accept: condition test succeeded in ACL "connect"
LOG: MAIN
10.9.8.8 accepted by connect ACL
accept: condition test succeeded in ACL "connect"
+end of ACL "connect": ACCEPT
using ACL "mail"
processing "warn"
using ACL "mail"
processing "warn"
+ message: added header line
check senders = ok@test3
address match test: subject=bad@test1 pattern=ok@test3
bad@test1 in "ok@test3"? no (end of list)
check senders = ok@test3
address match test: subject=bad@test1 pattern=ok@test3
bad@test1 in "ok@test3"? no (end of list)
@@
-44,6
+47,7
@@
LOG: MAIN REJECT
H=[10.9.8.8] U=CALLER rejected MAIL <bad@test1>
using ACL "mail"
processing "warn"
H=[10.9.8.8] U=CALLER rejected MAIL <bad@test1>
using ACL "mail"
processing "warn"
+ message: added header line
check senders = ok@test3
address match test: subject=ok@test1 pattern=ok@test3
test1 in "test3"? no (end of list)
check senders = ok@test3
address match test: subject=ok@test1 pattern=ok@test3
test1 in "test3"? no (end of list)
@@
-63,6
+67,7
@@
check logwrite = :main,reject: mail accepted "$smtp_command" "$smtp_command_argu
LOG: MAIN REJECT
mail accepted "mail from:<ok@test1>" "<ok@test1>"
accept: condition test succeeded in ACL "mail"
LOG: MAIN REJECT
mail accepted "mail from:<ok@test1>" "<ok@test1>"
accept: condition test succeeded in ACL "mail"
+end of ACL "mail": ACCEPT
using ACL "rcpt"
processing "accept"
check senders = +ok_senders
using ACL "rcpt"
processing "accept"
check senders = +ok_senders
@@
-79,6
+84,7
@@
check logwrite = :panic: rcpt accepted
LOG: PANIC
rcpt accepted
accept: condition test succeeded in ACL "rcpt"
LOG: PANIC
rcpt accepted
accept: condition test succeeded in ACL "rcpt"
+end of ACL "rcpt": ACCEPT
using ACL "rcpt"
processing "accept"
check senders = +ok_senders
using ACL "rcpt"
processing "accept"
check senders = +ok_senders
@@
-92,6
+98,7
@@
check logwrite = :panic: rcpt accepted
LOG: PANIC
rcpt accepted
accept: condition test succeeded in ACL "rcpt"
LOG: PANIC
rcpt accepted
accept: condition test succeeded in ACL "rcpt"
+end of ACL "rcpt": ACCEPT
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
LOG: smtp_connection MAIN
SMTP connection from CALLER closed by QUIT
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
@@
-116,6
+123,7
@@
check hosts = : 10.9.8.7
host in ": 10.9.8.7"? no (end of list)
deny: condition test failed in ACL "connect"
processing "drop"
host in ": 10.9.8.7"? no (end of list)
deny: condition test failed in ACL "connect"
processing "drop"
+l_message: forcibly dropped
check hosts = 10.9.8.9
host in "10.9.8.9"? no (end of list)
drop: condition test failed in ACL "connect"
check hosts = 10.9.8.9
host in "10.9.8.9"? no (end of list)
drop: condition test failed in ACL "connect"
@@
-125,8
+133,10
@@
check logwrite = $sender_host_address accepted by connect ACL
LOG: MAIN
10.9.8.8 accepted by connect ACL
accept: condition test succeeded in ACL "connect"
LOG: MAIN
10.9.8.8 accepted by connect ACL
accept: condition test succeeded in ACL "connect"
+end of ACL "connect": ACCEPT
using ACL "mail"
processing "warn"
using ACL "mail"
processing "warn"
+ message: added header line
check senders = ok@test3
address match test: subject=ok@test3 pattern=ok@test3
test3 in "test3"? yes (matched "test3")
check senders = ok@test3
address match test: subject=ok@test3 pattern=ok@test3
test3 in "test3"? yes (matched "test3")
@@
-148,6
+158,7
@@
check logwrite = :main,reject: mail accepted "$smtp_command" "$smtp_command_argu
LOG: MAIN REJECT
mail accepted "mail from:<ok@test3>" "<ok@test3>"
accept: condition test succeeded in ACL "mail"
LOG: MAIN REJECT
mail accepted "mail from:<ok@test3>" "<ok@test3>"
accept: condition test succeeded in ACL "mail"
+end of ACL "mail": ACCEPT
using ACL "rcpt"
processing "accept"
check senders = +ok_senders
using ACL "rcpt"
processing "accept"
check senders = +ok_senders
@@
-166,17
+177,20
@@
check logwrite = :panic: rcpt accepted
LOG: PANIC
rcpt accepted
accept: condition test succeeded in ACL "rcpt"
LOG: PANIC
rcpt accepted
accept: condition test succeeded in ACL "rcpt"
-host in ignore_fromline_hosts? no (option unset)
+end of ACL "rcpt": ACCEPT
+PDKIM >> raw hdr: {CR}{LF}
+PDKIM >> raw hdr: Some{SP}message{CR}{LF}
+PDKIM >> raw hdr: .{CR}{LF}
>>Headers added by MAIL or RCPT ACL:
X-ACL-Warn: added header line
>>
>>Headers added by MAIL or RCPT ACL:
X-ACL-Warn: added header line
>>
+PDKIM >> raw hdr: quit{CR}{LF}
LOG: MAIN
<= ok@test3 H=[10.9.8.8] U=CALLER P=smtp S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
LOG: MAIN
<= ok@test3 H=[10.9.8.8] U=CALLER P=smtp S=sss
Exim version x.yz ....
configuration file is TESTSUITE/test-config
trusted user
admin user
-skipping ACL configuration - not needed
x in "!bad"? yes (end of list)
LOG: MAIN
=> x <x@y> R=accept T=appendfile
x in "!bad"? yes (end of list)
LOG: MAIN
=> x <x@y> R=accept T=appendfile
git://git.exim.org / exim.git / blobdiff