Patch imported from bugzilla 1031. Axel Rau.

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

diff --git a/test/stderr/0371 b/test/stderr/0371
index 8b212f784a99eb9bdda5dada02d24e540bd61415..c4f9a93ac3c24f2c780510e23c74031829ae7f12 100644 (file)
--- a/test/stderr/0371
+++ b/test/stderr/0371
@@ -26,8 +26,8 @@ check set acl_c0 = $acl_c0; connect
                  = ; connect
 check set acl_c9 = $acl_c9; connect
                  = ; connect
-accept: condition test succeeded
-SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+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
 something in helo_lookup_domains? no (end of list)
@@ -35,10 +35,11 @@ sender_fullhost = (something) [V4NET.0.0.0]
 sender_rcvhost = [V4NET.0.0.0] (helo=something)
 set_process_info: pppp handling incoming connection from (something) [V4NET.0.0.0]
 host in pipelining_advertise_hosts? yes (matched "*")
-SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0]\r
-250-SIZE 52428800\r
-250-PIPELINING\r
-250 HELP\r
+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>
 using ACL "mail"
 processing "accept"
@@ -48,8 +49,8 @@ check set acl_c9 = $acl_c9; mail
                  = ; connect; mail
 check set acl_m0 = $acl_m0; mail
                  = ; mail
-accept: condition test succeeded
-SMTP>> 250 OK\r
+accept: condition test succeeded in ACL "mail"
+SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 using ACL "rcpt"
 processing "accept"
@@ -59,10 +60,10 @@ check set acl_m9 = $acl_m9; rcpt
                  = ; rcpt
 check set acl_c0 = $acl_c0; rcpt
                  = ; connect; mail; rcpt
-accept: condition test succeeded
-SMTP>> 250 Accepted\r
+accept: condition test succeeded in ACL "rcpt"
+SMTP>> 250 Accepted
 SMTP<< data
-SMTP>> 354 Enter message, ending with "." on a line by itself\r
+SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 >>Headers received:
 
@@ -82,12 +83,12 @@ check set acl_m0 = $acl_m0; 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
   <= x@y H=(something) [V4NET.0.0.0] P=esmtp S=sss
-SMTP>> 250 OK id=10HmaX-0005vi-00\r
+SMTP>> 250 OK id=10HmaX-0005vi-00
 smtp_setup_msg entered
 SMTP<< vrfy x@y
 host in smtp_accept_max_nonmail_hosts? yes (matched "*")
@@ -99,7 +100,7 @@ check set acl_c9 = $acl_c9; 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
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -109,7 +110,7 @@ routing x@y
 no more routers
 LOG: MAIN
   VRFY failed for x@y H=(something) [V4NET.0.0.0]
-SMTP>> 550 <x@y> Unrouteable address\r
+SMTP>> 550 <x@y> Unrouteable address
 SMTP<< mail from:<x@y>
 using ACL "mail"
 processing "accept"
@@ -119,10 +120,10 @@ check set acl_c9 = $acl_c9; mail
                  = ; connect; mail; vrfy; mail
 check set acl_m0 = $acl_m0; mail
                  = ; mail
-accept: condition test succeeded
-SMTP>> 250 OK\r
+accept: condition test succeeded in ACL "mail"
+SMTP>> 250 OK
 SMTP<< quit
-SMTP>> 221 mail.test.ex closing connection\r
+SMTP>> 221 mail.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from (something) [V4NET.0.0.0] closed by QUIT
 search_tidyup called