Cancel in-progress or reject requeted cutthrough when fakereject. Bug 1475

[users/heiko/exim.git] / test / stderr / 0371

diff --git a/test/stderr/0371 b/test/stderr/0371
index 8b9b8ef0bba1d2ae6c297bc4521ff79034ec4c9a..c4f9a93ac3c24f2c780510e23c74031829ae7f12 100644 (file)
--- a/test/stderr/0371
+++ b/test/stderr/0371
@@ -26,7 +26,7 @@ check set acl_c0 = $acl_c0; connect
                  = ; connect
 check set acl_c9 = $acl_c9; connect
                  = ; connect
                  = ; connect
 check set acl_c9 = $acl_c9; connect
                  = ; connect

-accept: condition test succeeded
+accept: condition test succeeded in ACL "connect"

 SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< ehlo something
 SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< ehlo something


@@ -37,6 +37,7 @@ set_process_info: pppp handling incoming connection from (something) [V4NET.0.0.
 host in pipelining_advertise_hosts? yes (matched "*")
 SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0]
 250-SIZE 52428800
 host in pipelining_advertise_hosts? yes (matched "*")
 SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0]
 250-SIZE 52428800

+250-8BITMIME

 250-PIPELINING
 250 HELP
 SMTP<< mail from:<x@y>
 250-PIPELINING
 250 HELP
 SMTP<< mail from:<x@y>


@@ -48,7 +49,7 @@ check set acl_c9 = $acl_c9; mail
                  = ; connect; mail
 check set acl_m0 = $acl_m0; mail
                  = ; mail
                  = ; connect; mail
 check set acl_m0 = $acl_m0; mail
                  = ; mail

-accept: condition test succeeded
+accept: condition test succeeded in ACL "mail"

 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 using ACL "rcpt"
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 using ACL "rcpt"


@@ -59,7 +60,7 @@ check set acl_m9 = $acl_m9; rcpt
                  = ; rcpt
 check set acl_c0 = $acl_c0; rcpt
                  = ; connect; mail; rcpt
                  = ; rcpt
 check set acl_c0 = $acl_c0; rcpt
                  = ; connect; mail; rcpt

-accept: condition test succeeded
+accept: condition test succeeded in ACL "rcpt"

 SMTP>> 250 Accepted
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 SMTP>> 250 Accepted
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself


@@ -82,7 +83,7 @@ check set acl_m0 = $acl_m0; data
                  = ; mail; rcpt; data
 check set acl_m9 = $acl_m9; data
                  = ; rcpt; data
                  = ; mail; rcpt; data
 check set acl_m9 = $acl_m9; data
                  = ; rcpt; data

-accept: condition test succeeded
+accept: condition test succeeded in ACL "data"

 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN


@@ -99,7 +100,7 @@ check set acl_c9 = $acl_c9; vrfy
                  = ; connect; mail; vrfy
 check set acl_m0 = $acl_m0; vrfy
                  = ; vrfy
                  = ; connect; mail; vrfy
 check set acl_m0 = $acl_m0; vrfy
                  = ; vrfy

-accept: condition test succeeded
+accept: condition test succeeded in ACL "vrfy"

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying x@y
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying x@y
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -119,7 +120,7 @@ check set acl_c9 = $acl_c9; mail
                  = ; connect; mail; vrfy; mail
 check set acl_m0 = $acl_m0; mail
                  = ; mail
                  = ; connect; mail; vrfy; mail
 check set acl_m0 = $acl_m0; mail
                  = ; mail

-accept: condition test succeeded
+accept: condition test succeeded in ACL "mail"

 SMTP>> 250 OK
 SMTP<< quit
 SMTP>> 221 mail.test.ex closing connection
 SMTP>> 250 OK
 SMTP<< quit
 SMTP>> 221 mail.test.ex closing connection