Merge branch '4.next'

[exim.git] / test / stderr / 0419

diff --git a/test/stderr/0419 b/test/stderr/0419
index f4619161809c3536c0c4ead9de7bdf92271353b1..d61a9ff035da022bfd5f82172a8a3bd410e5e2ec 100644 (file)
--- a/test/stderr/0419
+++ b/test/stderr/0419
@@ -1,10 +1,10 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
 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 = CALLER@test.ex
 Verifying: uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
@@ -18,7 +18,7 @@ routing k@mxt13.test.ex
 local_part=k domain=mxt13.test.ex
 checking domains
 mxt13.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? no (matched "!mxt13.test.ex")
-data from lookup saved for cache for +local_domains: mxt13.test.ex
+data from lookup saved for cache for +local_domains: key 'mxt13.test.ex' value 'mxt13.test.ex'
 mxt13.test.ex in "! +local_domains"? yes (end of list)
 calling dnslookup router
 dnslookup router called for k@mxt13.test.ex
@@ -44,10 +44,10 @@ set transport smtp
 queued for smtp transport: local_part = k
 domain = mxt13.test.ex
   errors_to=NULL
-  domain_data=mxt13.test.ex localpart_data=NULL
+  domain_data=mxt13.test.ex local_part_data=NULL
 routed by dnslookup router
   envelope to: k@mxt13.test.ex
   transport: smtp
   host other1.test.ex [V4NET.12.4.5] MX=4 dnssec=no
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>