Merge branch 'SMTPUTF8_1516'. Bug 1516

[users/jgh/exim.git] / test / stderr / 0465

diff --git a/test/stderr/0465 b/test/stderr/0465
index 4c84b14539f234e3fd22248847406d27a6531c59..f86dc46e82997405c3e636fef2852bd68cdd5ca1 100644 (file)
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -51,8 +51,10 @@ SMTP<< mail from:<>
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@domain.>
 processing "accept"
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@domain.>
 processing "accept"

-accept: condition test succeeded
+accept: condition test succeeded in inline ACL
+end of inline ACL: ACCEPT

 SMTP>> 250 Accepted
 SMTP>> 250 Accepted

+DSN: orcpt: NULL  flags: 0

 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called


@@ -75,10 +77,15 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 using ACL "check_data"
 processing "accept"
 check verify = header_syntax
 using ACL "check_data"
 processing "accept"
 check verify = header_syntax

-accept: condition test succeeded
+accept: condition test succeeded in ACL "check_data"
+end of ACL "check_data": ACCEPT

 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 Writing spool header file
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 Writing spool header file

+DSN: Write SPOOL :-dsn_envid NULL
+DSN: Write SPOOL :-dsn_ret 0
+DSN: Flags :0
+DSN: **** SPOOL_OUT - address: |abc@domain| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0

 Size of headers = sss
 LOG: MAIN
   <= <> U=CALLER P=local-smtp S=sss
 Size of headers = sss
 LOG: MAIN
   <= <> U=CALLER P=local-smtp S=sss


@@ -113,8 +120,10 @@ SMTP<< mail from:<>
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@xyz>
 processing "accept"
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@xyz>
 processing "accept"

-accept: condition test succeeded
+accept: condition test succeeded in inline ACL
+end of inline ACL: ACCEPT

 SMTP>> 250 Accepted
 SMTP>> 250 Accepted

+DSN: orcpt: NULL  flags: 0

 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called


@@ -137,7 +146,7 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
 using ACL "check_data"
 processing "accept"
 check verify = header_syntax
 using ACL "check_data"
 processing "accept"
 check verify = header_syntax

-accept: condition test failed
+accept: condition test failed in ACL "check_data"

 end of ACL "check_data": implicit DENY
 SMTP>> 550 Administrative prohibition
 LOG: MAIN REJECT
 end of ACL "check_data": implicit DENY
 SMTP>> 550 Administrative prohibition
 LOG: MAIN REJECT