De-duplicate two documentation sections

[exim.git] / test / stderr / 0420

diff --git a/test/stderr/0420 b/test/stderr/0420
index fc24272de9fb4b925f0437aefca71c75bd028ac7..fbb2bf6c6c85992746299c09a89fe31498a50a32 100644 (file)
--- a/test/stderr/0420
+++ b/test/stderr/0420
@@ -20,16 +20,16 @@ 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)
 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 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 smtp_setup_msg entered
 SMTP<< mail from:<x@y>
 smtp_setup_msg entered
 SMTP<< mail from:<x@y>

-SMTP>> 250 OK\r
+SMTP>> 250 OK

 SMTP<< rcpt to:<x@y>
 processing "accept"
 SMTP<< rcpt to:<x@y>
 processing "accept"

-accept: condition test succeeded
-SMTP>> 250 Accepted\r
+accept: condition test succeeded in inline ACL
+SMTP>> 250 Accepted

 SMTP<< data
 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:
 search_tidyup called
 host in ignore_fromline_hosts? no (option unset)
 >>Headers received:


@@ -44,16 +44,16 @@ calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN
   <= x@y H=[V4NET.0.0.0] P=smtp S=sss
 local_scan() returned 0 NULL
 LOG: MAIN
   <= x@y H=[V4NET.0.0.0] P=smtp S=sss

-SMTP>> 250 OK id=10HmaX-0005vi-00\r
+SMTP>> 250 OK id=10HmaX-0005vi-00

 smtp_setup_msg entered
 SMTP<< mail from:<a@b>
 smtp_setup_msg entered
 SMTP<< mail from:<a@b>

-SMTP>> 250 OK\r
+SMTP>> 250 OK

 SMTP<< rcpt to:<x@y>
 processing "accept"
 SMTP<< rcpt to:<x@y>
 processing "accept"

-accept: condition test succeeded
-SMTP>> 250 Accepted\r
+accept: condition test succeeded in inline ACL
+SMTP>> 250 Accepted

 SMTP<< data
 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:
 search_tidyup called
 host in ignore_fromline_hosts? no (option unset)
 >>Headers received:


@@ -68,10 +68,10 @@ calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN
   <= a@b H=[V4NET.0.0.0] P=smtp S=sss
 local_scan() returned 0 NULL
 LOG: MAIN
   <= a@b H=[V4NET.0.0.0] P=smtp S=sss

-SMTP>> 250 OK id=10HmaY-0005vi-00\r
+SMTP>> 250 OK id=10HmaY-0005vi-00

 smtp_setup_msg entered
 SMTP<< quit
 smtp_setup_msg entered
 SMTP<< quit

-SMTP>> 221 mail.test.ex closing connection\r
+SMTP>> 221 mail.test.ex closing connection

 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.0.0.0] closed by QUIT
 search_tidyup called
 LOG: smtp_connection MAIN
   SMTP connection from [V4NET.0.0.0] closed by QUIT
 search_tidyup called