Tidies to SMTP dialogue debugging output.

1 files changed, 38 insertions, 38 deletions

diff --git a/test/stderr/0294 b/test/stderr/0294
index 5afdb770a..184cf9f41 100644
--- a/test/stderr/0294
+++ b/test/stderr/0294
@@ -6,26 +6,26 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
-SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+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

+SMTP>> 250 OK
 SMTP<< rcpt to:<one@z>
-SMTP>> 250 Accepted

+SMTP>> 250 Accepted
 SMTP<< rcpt to:<one@z>
 rate limit RCPT: delay 0.25 sec
-SMTP>> 250 Accepted

+SMTP>> 250 Accepted
 SMTP<< rcpt to:<one@z>
 rate limit RCPT: delay 0.263 sec
-SMTP>> 250 Accepted

+SMTP>> 250 Accepted
 SMTP<< rcpt to:<one@z>
 rate limit RCPT: delay 0.276 sec
-SMTP>> 250 Accepted

+SMTP>> 250 Accepted
 SMTP<< rcpt to:<one@z>
 rate limit RCPT: delay 0.289 sec
-SMTP>> 250 Accepted

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

+SMTP>> 354 Enter message, ending with "." on a line by itself
 >>Headers received:
 
 >>Headers after rewriting and local additions:
@@ -45,15 +45,15 @@ Size of headers = sss
 LOG: MAIN
   <= x@y U=CALLER P=local-smtp S=sss
 created log directory TESTSUITE/spool/log
-SMTP>> 250 OK id=10HmaX-0005vi-00

+SMTP>> 250 OK id=10HmaX-0005vi-00
 smtp_setup_msg entered
 SMTP<< mail from:<x@y>
 rate limit MAIL: delay 1 sec
-SMTP>> 250 OK

+SMTP>> 250 OK
 SMTP<< rcpt to:<two@z>
-SMTP>> 250 Accepted

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

+SMTP>> 354 Enter message, ending with "." on a line by itself
 >>Headers received:
 
 >>Headers after rewriting and local additions:
@@ -73,13 +73,13 @@ Writing spool header file
 Size of headers = sss
 LOG: MAIN
   <= x@y U=CALLER P=local-smtp S=sss
-SMTP>> 250 OK id=10HmaY-0005vi-00

+SMTP>> 250 OK id=10HmaY-0005vi-00
 smtp_setup_msg entered
 SMTP<< mail from:<x@y>
 rate limit MAIL: delay 2 sec
-SMTP>> 250 OK

+SMTP>> 250 OK
 SMTP<< quit
-SMTP>> 221 myhost.test.ex closing connection

+SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -99,10 +99,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

+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

+SMTP>> 250 OK
 SMTP<< rcpt to:<one@z>
 processing "deny"
 check local_parts = reject
@@ -110,7 +110,7 @@ one in "reject"? no (end of list)
 deny: condition test failed
 processing "accept"
 accept: condition test succeeded
-SMTP>> 250 Accepted

+SMTP>> 250 Accepted
 SMTP<< rcpt to:<one@z>
 host in smtp_ratelimit_hosts? no (end of list)
 processing "deny"
@@ -119,9 +119,9 @@ one in "reject"? no (end of list)
 deny: condition test failed
 processing "accept"
 accept: condition test succeeded
-SMTP>> 250 Accepted

+SMTP>> 250 Accepted
 SMTP<< quit
-SMTP>> 221 myhost.test.ex closing connection

+SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from [1.2.3.4] closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -141,10 +141,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

+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

+SMTP>> 250 OK
 SMTP<< rcpt to:<one@z>
 processing "deny"
 check local_parts = reject
@@ -152,7 +152,7 @@ one in "reject"? no (end of list)
 deny: condition test failed
 processing "accept"
 accept: condition test succeeded
-SMTP>> 250 Accepted

+SMTP>> 250 Accepted
 SMTP<< rcpt to:<one@z>
 host in smtp_ratelimit_hosts? yes (matched "V4NET.9.8.7")
 rate limit RCPT: delay 0.25 sec
@@ -162,9 +162,9 @@ one in "reject"? no (end of list)
 deny: condition test failed
 processing "accept"
 accept: condition test succeeded
-SMTP>> 250 Accepted

+SMTP>> 250 Accepted
 SMTP<< quit
-SMTP>> 221 myhost.test.ex closing connection

+SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.9.8.7] closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -176,50 +176,50 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
-SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+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

+SMTP>> 250 OK
 SMTP<< rcpt to:<reject@z>
-SMTP>> 550 Administrative prohibition

+SMTP>> 550 Administrative prohibition
 LOG: MAIN REJECT
   U=CALLER F=<x@y> rejected RCPT <reject@z>
 SMTP<< rcpt to:<reject@z>
 rate limit RCPT: delay 0.25 sec
-SMTP>> 550 Administrative prohibition

+SMTP>> 550 Administrative prohibition
 LOG: MAIN REJECT
   U=CALLER F=<x@y> rejected RCPT <reject@z>
 SMTP<< rcpt to:<reject@z>
 rate limit RCPT: delay 0.263 sec
-SMTP>> 550 Administrative prohibition

+SMTP>> 550 Administrative prohibition
 LOG: MAIN REJECT
   U=CALLER F=<x@y> rejected RCPT <reject@z>
 SMTP<< rcpt to:<reject@z>
 rate limit RCPT: delay 0.276 sec
-SMTP>> 550 Administrative prohibition

+SMTP>> 550 Administrative prohibition
 LOG: MAIN REJECT
   U=CALLER F=<x@y> rejected RCPT <reject@z>
 SMTP<< rcpt to:<reject@z>
 rate limit RCPT: delay 0.289 sec
-SMTP>> 550 Administrative prohibition

+SMTP>> 550 Administrative prohibition
 LOG: MAIN REJECT
   U=CALLER F=<x@y> rejected RCPT <reject@z>
 SMTP<< rset
-SMTP>> 250 Reset OK

+SMTP>> 250 Reset OK
 SMTP<< mail from:<x@y>
 rate limit MAIL: delay 1 sec
-SMTP>> 250 OK

+SMTP>> 250 OK
 SMTP<< rcpt to:<reject@z>
-SMTP>> 550 Administrative prohibition

+SMTP>> 550 Administrative prohibition
 LOG: MAIN REJECT
   U=CALLER F=<x@y> rejected RCPT <reject@z>
 SMTP<< rset
-SMTP>> 250 Reset OK

+SMTP>> 250 Reset OK
 SMTP<< mail from:<x@y>
 rate limit MAIL: delay 2 sec
-SMTP>> 250 OK

+SMTP>> 250 OK
 SMTP<< quit
-SMTP>> 221 myhost.test.ex closing connection

+SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>