Tidies to SMTP dialogue debugging output.

[exim.git] / test / stderr / 2600

diff --git a/test/stderr/2600 b/test/stderr/2600
index 58371eb8bbfefd608efc8a089ff80b53827ecaa7..9ba7bc19d49236f78944ce323bdfb2f91adb2bee 100644 (file)
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -126,10 +126,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:<a@b>
-SMTP>> 250 OK\r
+SMTP>> 250 OK
 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"
 processing "accept"
@@ -154,7 +154,7 @@ host in "+relay_hosts"? no (end of list)
 accept: condition test failed
 processing "deny"
 deny: condition test succeeded
-SMTP>> 550 relay not permitted\r
+SMTP>> 550 relay not permitted
 LOG: MAIN REJECT
   H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 SMTP<< rcpt to:<c@d>
@@ -182,11 +182,11 @@ host in "+relay_hosts"? no (end of list)
 accept: condition test failed
 processing "deny"
 deny: condition test succeeded
-SMTP>> 550 relay not permitted\r
+SMTP>> 550 relay not permitted
 LOG: MAIN REJECT
   H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
 SMTP<< quit
-SMTP>> 221 myhost.test.ex closing connection\r
+SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from [10.0.0.0] closed by QUIT
 search_tidyup called
@@ -213,10 +213,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:<a@b>
-SMTP>> 250 OK\r
+SMTP>> 250 OK
 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"
 processing "accept"
@@ -238,7 +238,7 @@ lookup yielded: name=ok id=10.10.10.10
 host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"? yes (matched "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'")
 host in "+relay_hosts"? yes (matched "+relay_hosts")
 accept: condition test succeeded
-SMTP>> 250 Accepted\r
+SMTP>> 250 Accepted
 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"
 processing "accept"
@@ -261,9 +261,9 @@ lookup yielded: name=ok id=10.10.10.10
 host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"? yes (matched "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'")
 host in "+relay_hosts"? yes (matched "+relay_hosts")
 accept: condition test succeeded
-SMTP>> 250 Accepted\r
+SMTP>> 250 Accepted
 SMTP<< quit
-SMTP>> 221 myhost.test.ex closing connection\r
+SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from [10.10.10.10] closed by QUIT
 search_tidyup called