Avoid reset of store pool in expand when a ${acl is used; it may have side-effects...

[exim.git] / test / stderr / 0464

diff --git a/test/stderr/0464 b/test/stderr/0464
index c8df6e5da4c1dbf9aab6082d267304e356a6d7a0..6d2746223d07d32930546a35b0ee7c5b05790330 100644 (file)
--- a/test/stderr/0464
+++ b/test/stderr/0464
@@ -11,10 +11,10 @@ set_process_info: pppp accepting a local SMTP message from <CALLER@myhost.test.e
  in hosts_connection_nolog? no (option unset)
 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\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:<>
-SMTP>> 250 OK\r
+SMTP>> 250 OK
 SMTP<< rcpt to:<abc@domain1>
 using ACL "rcpt"
 processing "require"
@@ -23,7 +23,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
 search_find: file="TESTSUITE/aux-fixed/0464.domains"
   key="domain1" partial=-1 affix=NULL starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0464.domains
+  0TESTSUITE/aux-fixed/0464.domains
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
   type=lsearch key="domain1"
@@ -70,7 +70,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
 search_find: file="TESTSUITE/aux-fixed/0464.domains"
   key="xxx.domain1" partial=-1 affix=NULL starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0464.domains
+  0TESTSUITE/aux-fixed/0464.domains
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
   type=lsearch key="xxx.domain1"
@@ -94,7 +94,7 @@ routed by r2 router
   envelope to: abc@xxx.domain1
   transport: smtp
 ----------- end verify ------------
-require: condition test succeeded
+require: condition test succeeded in ACL "rcpt"
 processing "require"
 check domains = +special_domains
 cached yes match for +special_domains
@@ -137,7 +137,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
 search_find: file="TESTSUITE/aux-fixed/0464.domains"
   key="xxx.domain1" partial=-1 affix=NULL starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0464.domains
+  0TESTSUITE/aux-fixed/0464.domains
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
   type=lsearch key="xxx.domain1"
@@ -160,12 +160,12 @@ routed by r2 router
   envelope to: abc@xxx.domain1
   transport: smtp
 ----------- end verify ------------
-require: condition test succeeded
+require: condition test succeeded in ACL "rcpt"
 processing "accept"
-accept: condition test succeeded
-SMTP>> 250 Accepted\r
+accept: condition test succeeded in ACL "rcpt"
+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 CALLER closed by QUIT
 search_tidyup called