Tidies to SMTP dialogue debugging output.

[exim.git] / test / stderr / 0386

diff --git a/test/stderr/0386 b/test/stderr/0386
index 3b9c6d950cc91a00e7771942ef5aa1c149f3fc3b..89e64a9e0ca3bbcc8026cfaa8b515810a34edcc3 100644 (file)
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -22,10 +22,10 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< mail from:<x@y>
-SMTP>> 250 OK\r
+SMTP>> 250 OK
 SMTP<< rcpt to:<1@b>
 read ACL from file TESTSUITE/aux-fixed/0386.acl1
 processing "accept"
@@ -62,13 +62,13 @@ sender x@y verified ok
 require: condition test succeeded
 processing "deny"
 deny: condition test succeeded
-SMTP>> 550 No such user here\r
+SMTP>> 550 No such user here
 LOG: MAIN REJECT
   H=[V4NET.9.8.7] F=<x@y> rejected RCPT <1@b>: No such user here
 SMTP<< rset
-SMTP>> 250 Reset OK\r
+SMTP>> 250 Reset OK
 SMTP<< mail from:<x@y>
-SMTP>> 250 OK\r
+SMTP>> 250 OK
 SMTP<< rcpt to:<1@b>
 using ACL "TESTSUITE/aux-fixed/0386.acl1"
 processing "accept"
@@ -104,11 +104,11 @@ sender x@y verified ok
 require: condition test succeeded
 processing "deny"
 deny: condition test succeeded
-SMTP>> 550 No such user here\r
+SMTP>> 550 No such user here
 LOG: MAIN REJECT
   H=[V4NET.9.8.7] F=<x@y> rejected RCPT <1@b>: No such user here
 SMTP<< quit
-SMTP>> 221 myhost.test.ex closing connection\r
+SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.9.8.7] closed by QUIT
 search_tidyup called
@@ -138,10 +138,10 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< mail from:<x@y>
-SMTP>> 250 OK\r
+SMTP>> 250 OK
 SMTP<< rcpt to:<2@b>
 read ACL from file TESTSUITE/aux-fixed/0386.acl2
 processing "warn"
@@ -160,9 +160,9 @@ LOG: MAIN
 created log directory TESTSUITE/spool/log
 processing "accept"
 accept: condition test succeeded
-SMTP>> 250 Accepted\r
+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
 host in ignore_fromline_hosts? no (option unset)
 >>Headers received:
@@ -187,7 +187,7 @@ Writing spool header file
 Size of headers = sss
 LOG: MAIN
   <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
-SMTP>> 250 OK id=10HmaX-0005vi-00\r
+SMTP>> 250 OK id=10HmaX-0005vi-00
 search_tidyup called
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
 Exim version x.yz ....
@@ -299,9 +299,9 @@ search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 smtp_setup_msg entered
 SMTP<< rset
-SMTP>> 250 Reset OK\r
+SMTP>> 250 Reset OK
 SMTP<< mail from:<x@y>
-SMTP>> 250 OK\r
+SMTP>> 250 OK
 SMTP<< rcpt to:<2@b>
 using ACL "TESTSUITE/aux-fixed/0386.acl2"
 processing "warn"
@@ -315,9 +315,9 @@ LOG: MAIN
   H=[V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message
 processing "accept"
 accept: condition test succeeded
-SMTP>> 250 Accepted\r
+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
 host in ignore_fromline_hosts? no (option unset)
 >>Headers received:
@@ -342,7 +342,7 @@ Writing spool header file
 Size of headers = sss
 LOG: MAIN
   <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
-SMTP>> 250 OK id=10HmaY-0005vi-00\r
+SMTP>> 250 OK id=10HmaY-0005vi-00
 search_tidyup called
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaY-0005vi-00
 Exim version x.yz ....
@@ -453,7 +453,7 @@ search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 smtp_setup_msg entered
 SMTP<< quit
-SMTP>> 221 myhost.test.ex closing connection\r
+SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 search_tidyup called