Fix logging of drop-after-EHLO-reject.

[exim.git] / test / stderr / 0021

diff --git a/test/stderr/0021 b/test/stderr/0021
index 3dbb81639b1441f396b910128a555350aa150843..4be6c99c5a399f14f7e3248b87463a4ea0b29b07 100644 (file)
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -28,6 +28,7 @@ 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"
   message: added header line
 using ACL "mail"
 processing "warn"
   message: added header line


@@ -66,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


@@ -82,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


@@ -95,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 >>>>>>>>>>>>>>>>


@@ -129,6 +133,7 @@ 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"
   message: added header line
 using ACL "mail"
 processing "warn"
   message: added header line


@@ -153,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


@@ -171,10 +177,14 @@ 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 ....
 LOG: MAIN
   <= ok@test3 H=[10.9.8.8] U=CALLER P=smtp S=sss
 Exim version x.yz ....