X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/54c5ebb14ead7439af300e9d7d9d7d2ba29ff32e..8ef02a06b1fccc921e34c48633a1d4659326dacc:/test/stderr/0371

diff --git a/test/stderr/0371 b/test/stderr/0371
index 8b212f784..534a643f3 100644
--- a/test/stderr/0371
+++ b/test/stderr/0371
@@ -26,19 +26,22 @@ 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
+accept: condition test succeeded in ACL "connect"
+end of ACL "connect": ACCEPT
+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)
 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 dsn_advertise_hosts? no (option unset)
 host in pipelining_advertise_hosts? yes (matched "*")
-SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0]
-250-SIZE 52428800
-250-PIPELINING
-250 HELP
+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 +51,9 @@ check set acl_c9 = $acl_c9; mail
                  = ; connect; mail
 check set acl_m0 = $acl_m0; mail
                  = ; mail
-accept: condition test succeeded
-SMTP>> 250 OK
+accept: condition test succeeded in ACL "mail"
+end of ACL "mail": ACCEPT
+SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 using ACL "rcpt"
 processing "accept"
@@ -59,10 +63,12 @@ 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
+accept: condition test succeeded in ACL "rcpt"
+end of ACL "rcpt": ACCEPT
+SMTP>> 250 Accepted
+DSN: orcpt: NULL  flags: 0
 SMTP<< data
-SMTP>> 354 Enter message, ending with "." on a line by itself
+SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 >>Headers received:
 
@@ -82,12 +88,13 @@ 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"
+end of ACL "data": ACCEPT
 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
+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 +106,8 @@ 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"
+end of ACL "vrfy": ACCEPT
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying x@y
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -109,7 +117,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
+SMTP>> 550 <x@y> Unrouteable address
 SMTP<< mail from:<x@y>
 using ACL "mail"
 processing "accept"
@@ -119,10 +127,11 @@ 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
+accept: condition test succeeded in ACL "mail"
+end of ACL "mail": ACCEPT
+SMTP>> 250 OK
 SMTP<< quit
-SMTP>> 221 mail.test.ex closing connection
+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