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

[exim.git] / test / stderr / 0381

diff --git a/test/stderr/0381 b/test/stderr/0381
index 9897694546195c95cd78b37feb0cffa4552f272c..7f6f680dba1dc48d5ef8bd386639e03f6efa7a0f 100644 (file)
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -1,6 +1,8 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
+seeking password data for user "CALLER": cache not available
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -11,6 +13,7 @@ sender address = NULL
 sender_fullhost = [V4NET.99.99.97]
 sender_rcvhost = [V4NET.99.99.97] (ident=CALLER)
 set_process_info: pppp handling incoming connection from [V4NET.99.99.97] via -oMa
+set_process_info: pppp accepting a local SMTP message from <CALLER>
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
@@ -22,10 +25,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\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:<notgov@test.ex>
-SMTP>> 250 OK\r
+SMTP>> 250 OK
 SMTP<< rcpt to:<x@test.ex>
 using ACL "check_rcpt"
 processing "warn"
@@ -34,16 +37,8 @@ sender host name required, to match against *.gov.uk.test.ex
 looking up host name for V4NET.99.99.97
 DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) using fakens
 DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) succeeded
-IP address lookup yielded x.co.uk.test.ex
-  alias x.gov.uk.test.ex
-using host_fake_gethostbyname for x.co.uk.test.ex (IPv4)
-DNS lookup of x.co.uk.test.ex (A) using fakens
-DNS lookup of x.co.uk.test.ex (A) succeeded
-MUNGED: ::1 will be omitted in what follows
-get[host|ipnode]byname[2] looked up these IP addresses:
-  name=x.co.uk.test.ex address=V4NET.99.99.97
-checking addresses for x.co.uk.test.ex
-  V4NET.99.99.97 OK
+IP address lookup yielded x.gov.uk.test.ex
+  alias x.co.uk.test.ex
 using host_fake_gethostbyname for x.gov.uk.test.ex (IPv4)
 DNS lookup of x.gov.uk.test.ex (A) using fakens
 DNS lookup of x.gov.uk.test.ex (A) succeeded
@@ -52,27 +47,35 @@ get[host|ipnode]byname[2] looked up these IP addresses:
   name=x.gov.uk.test.ex address=V4NET.99.99.97
 checking addresses for x.gov.uk.test.ex
   V4NET.99.99.97 OK
-sender_fullhost = x.co.uk.test.ex [V4NET.99.99.97]
-sender_rcvhost = x.co.uk.test.ex ([V4NET.99.99.97] ident=CALLER)
+using host_fake_gethostbyname for x.co.uk.test.ex (IPv4)
+DNS lookup of x.co.uk.test.ex (A) using fakens
+DNS lookup of x.co.uk.test.ex (A) succeeded
+MUNGED: ::1 will be omitted in what follows
+get[host|ipnode]byname[2] looked up these IP addresses:
+  name=x.co.uk.test.ex address=V4NET.99.99.97
+checking addresses for x.co.uk.test.ex
+  V4NET.99.99.97 OK
+sender_fullhost = x.gov.uk.test.ex [V4NET.99.99.97]
+sender_rcvhost = x.gov.uk.test.ex ([V4NET.99.99.97] ident=CALLER)
 host in "*.gov.uk.test.ex"? yes (matched "*.gov.uk.test.ex")
-warn: condition test succeeded
+warn: condition test succeeded in ACL "check_rcpt"
 processing "warn"
 check hosts = !*.gov.uk.test.ex
 host in "!*.gov.uk.test.ex"? no (matched "!*.gov.uk.test.ex")
-warn: condition test failed
+warn: condition test failed in ACL "check_rcpt"
 processing "warn"
 check hosts = *.co.uk.test.ex
 host in "*.co.uk.test.ex"? yes (matched "*.co.uk.test.ex")
-warn: condition test succeeded
+warn: condition test succeeded in ACL "check_rcpt"
 processing "warn"
 check hosts = !*.co.uk.test.ex
 host in "!*.co.uk.test.ex"? no (matched "!*.co.uk.test.ex")
-warn: condition test failed
+warn: condition test failed in ACL "check_rcpt"
 processing "accept"
-accept: condition test succeeded
-SMTP>> 250 Accepted\r
+accept: condition test succeeded in ACL "check_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