Regex cache observability

[exim.git] / test / stderr / 0381

diff --git a/test/stderr/0381 b/test/stderr/0381
index 0edf18cf5ea62a0a735f4259879f1efa1c9d8fcc..0219ec4cca1e58020768bf16bc2ce474c707763d 100644 (file)
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -1,13 +1,13 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
 Exim version x.yz ....
 changed uid/gid: forcing real = effective

-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1234

 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
 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
+  uid=EXIM_UID gid=EXIM_GID pid=p1234

 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL
 sender_fullhost = [V4NET.99.99.97]
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL
 sender_fullhost = [V4NET.99.99.97]


@@ -27,6 +27,12 @@ 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
 smtp_setup_msg entered
 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
 smtp_setup_msg entered

+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [V4NET.99.99.97]
+sender_rcvhost = [V4NET.99.99.97] (helo=test ident=CALLER)
+set_process_info: pppp handling incoming connection from (test) [V4NET.99.99.97] U=CALLER
+SMTP>> 250 myhost.test.ex Hello CALLER at test [V4NET.99.99.97]

 SMTP<< mail from:<notgov@test.ex>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<notgov@test.ex>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -53,8 +59,9 @@ x.co.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx
 checking addresses for x.co.uk.test.ex
 Forward DNS security status: unverified
   V4NET.99.99.97 OK
 checking addresses for x.co.uk.test.ex
 Forward DNS security status: unverified
   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)
+sender_fullhost = x.gov.uk.test.ex (test) [V4NET.99.99.97]
+sender_rcvhost = x.gov.uk.test.ex
+       ([V4NET.99.99.97] helo=test ident=CALLER)

 host in "*.gov.uk.test.ex"? yes (matched "*.gov.uk.test.ex")
 warn: condition test succeeded in ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 18)
 host in "*.gov.uk.test.ex"? yes (matched "*.gov.uk.test.ex")
 warn: condition test succeeded in ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 18)


@@ -78,4 +85,4 @@ SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 search_tidyup called
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>