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

[exim.git] / test / stderr / 0398

diff --git a/test/stderr/0398 b/test/stderr/0398
index 6ed0f82e7be1dbcfef6bf1ea87a7b73a14c81b5c..db5c4cf790127ed6f932e3f9a1f0b64da6867dfc 100644 (file)
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -5,6 +5,8 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
+seeking password data for user "CALLER": cache not available
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 set_process_info: pppp accepting a local SMTP message from <CALLER@test.ex>
@@ -65,7 +67,7 @@ routed by r2 router
   host 127.0.0.1 [127.0.0.1]
 ----------- end verify ------------
 sender qq@remote verified ok
-deny: condition test failed
+deny: condition test failed in ACL "rcpt"
 processing "warn"
 check senders = qq@remote
 address match: subject=qq@remote pattern=qq@remote
@@ -124,7 +126,8 @@ callout cache: no address record found
 interface=NULL port=1224
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
-  SMTP>> HELO mail.test.ex
+127.0.0.1 in hosts_avoid_esmtp? no (option unset)
+  SMTP>> EHLO mail.test.ex
   SMTP<< 250 OK
   SMTP>> MAIL FROM:<>
   SMTP<< 250 OK
@@ -142,7 +145,7 @@ wrote callout cache domain record:
 dbfn_write: key=qq@remote
 wrote negative callout cache address record
 ----------- end verify ------------
-warn: condition test succeeded
+warn: condition test succeeded in ACL "rcpt"
 LOG: MAIN
   U=CALLER Warning: Sender verify failed: response to "RCPT TO:<qq@remote>" from 127.0.0.1 [127.0.0.1] was: 550 Unknown
 processing "accept"
@@ -150,7 +153,7 @@ check senders = qq@remote
 address match: subject=qq@remote pattern=qq@remote
 remote in "remote"? yes (matched "remote")
 qq@remote in "qq@remote"? yes (matched "qq@remote")
-accept: condition test succeeded
+accept: condition test succeeded in ACL "rcpt"
 SMTP>> 250 Accepted
 SMTP<< rcpt to:<xyz@local>
 using ACL "rcpt"
@@ -161,7 +164,7 @@ remote in "remote"? yes (matched "remote")
 qq@remote in "qq@remote"? yes (matched "qq@remote")
 check !verify = sender
 using cached sender verify result
-deny: condition test failed
+deny: condition test failed in ACL "rcpt"
 processing "warn"
 check senders = qq@remote
 address match: subject=qq@remote pattern=qq@remote
@@ -219,7 +222,7 @@ dbfn_read: key=qq@remote
 callout cache: found address record
 callout cache: address record is negative
 ----------- end verify ------------
-warn: condition test succeeded
+warn: condition test succeeded in ACL "rcpt"
 LOG: MAIN
   U=CALLER Warning: Sender verify failed
 processing "accept"
@@ -227,7 +230,7 @@ check senders = qq@remote
 address match: subject=qq@remote pattern=qq@remote
 remote in "remote"? yes (matched "remote")
 qq@remote in "qq@remote"? yes (matched "qq@remote")
-accept: condition test succeeded
+accept: condition test succeeded in ACL "rcpt"
 SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 mail.test.ex closing connection