X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/898d150f9aa9c796bb01117bc438b24ddb2e7435..aa2a70baf1a7ae2d6c579094a188c1d30d3d5fd5:/test/stderr/0487?ds=sidebyside

diff --git a/test/stderr/0487 b/test/stderr/0487
index 07628551a..4f2bbc2aa 100644
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -1,14 +1,18 @@
 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
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-finduser used cached passwd data for CALLER
+seeking password data for user "CALLER": using cached result
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL
+set_process_info: pppp accepting a local SMTP message from <CALLER>
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
@@ -18,13 +22,15 @@ SMTP<< ehlo x.y
  in pipelining_advertise_hosts? yes (matched "*")
 SMTP>> 250-myhost.test.ex Hello CALLER at x.y
 250-SIZE 52428800
+250-8BITMIME
 250-PIPELINING
 250 HELP
 SMTP<< mail from:<x@y>
 SMTP>> 250 OK
 SMTP<< rcpt to:<userx@test.ex>
 processing "accept"
-accept: condition test succeeded
+accept: condition test succeeded in inline ACL
+end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
@@ -60,10 +66,13 @@ exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_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
-finduser used cached passwd data for CALLER
+seeking password data for user "CALLER": using cached result
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages
 set_process_info: pppp delivering 10HmaX-0005vi-00
 reading spool file 10HmaX-0005vi-00-H
@@ -135,11 +144,11 @@ hitch name: TESTSUITE/test-mail/userx.lock.test.ex.dddddddd.pppppppp
 lock file created
 mailbox TESTSUITE/test-mail/userx is locked
 writing to file TESTSUITE/test-mail/userx
-writing data block fd=6 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
 rewrite_one_header: type=F:
   From: unqualified
-writing data block fd=6 size=sss timeout=0
-writing data block fd=6 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
 appendfile yields 0 with errno=dd more_errno=dd
 search_tidyup called
 journalling userx@test.ex