X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/4b01271fa595a08e68ba8c58d6404e83623aa9c8..e0b3815dc398d7abaa1f81c9f26b1c9b050e94c0:/test/stderr/0283?ds=sidebyside

diff --git a/test/stderr/0283 b/test/stderr/0283
index 13cc31bb2..a17ec26ef 100644
--- a/test/stderr/0283
+++ b/test/stderr/0283
@@ -1,12 +1,12 @@
 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 "root": cache not available
 getpwnam() succeeded uid=uuuu gid=gggg
 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
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 seeking password data for user "root": cache not available
@@ -14,12 +14,9 @@ getpwnam() succeeded uid=uuuu gid=gggg
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
-fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
-fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=EXIM_GID pid=pppp
+  uid=uuuu gid=EXIM_GID pid=p1235
 seeking password data for user "root": cache not available
 getpwnam() succeeded uid=uuuu gid=gggg
 configuration file is TESTSUITE/test-config
@@ -30,47 +27,34 @@ seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 seeking password data for user "root": cache not available
 getpwnam() succeeded uid=uuuu gid=gggg
-local-accept-delivery forking for delivery-local
-postfork: delivery-local
+somebody in local_parts? no (end of list)
+somebody in local_parts? no (end of list)
 changed uid/gid: local delivery to somebody <somebody@myhost.test.ex> transport=t1
-  uid=EXIM_UID gid=EXIM_GID pid=pppp
-delivery-local forking for pipe-tpt-cmd
-postfork: pipe-tpt-cmd
-local-accept-delivery forked for delivery-local: npppp
-delivery-local forked for pipe-tpt-cmd: npppp
-delivery-local forking for pipe-tpt-output
-postfork: pipe-tpt-output
-delivery-local forked for pipe-tpt-output: npppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1236
 transport error EPIPE ignored
 LOG: MAIN
   ** somebody@myhost.test.ex R=rest T=t1: return message generated
 changed uid/gid: post-delivery tidying
-  uid=EXIM_UID gid=EXIM_GID pid=pppp
-local-accept-delivery forking for bounce-message
-postfork: bounce-message
-local-accept-delivery forked for bounce-message: npppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1235
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=EXIM_GID pid=pppp
+  uid=uuuu gid=EXIM_GID pid=p1237
 seeking password data for user "root": cache not available
 getpwnam() succeeded uid=uuuu gid=gggg
 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=p1237
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 seeking password data for user "root": cache not available
 getpwnam() succeeded uid=uuuu gid=gggg
 LOG: MAIN
-  <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss
-bounce-message forking for local-accept-delivery
-postfork: local-accept-delivery
-bounce-message forked for local-accept-delivery: npppp
+  <= <> R=10HmaY-000000005vi-0000 U=EXIMUSER P=local S=sss
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=EXIM_GID pid=pppp
+  uid=uuuu gid=EXIM_GID pid=p1238
 seeking password data for user "root": cache not available
 getpwnam() succeeded uid=uuuu gid=gggg
 configuration file is TESTSUITE/test-config
@@ -81,44 +65,39 @@ seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 seeking password data for user "root": cache not available
 getpwnam() succeeded uid=uuuu gid=gggg
-local-accept-delivery forking for delivery-local
-postfork: delivery-local
+CALLER in local_parts? no (end of list)
 changed uid/gid: local delivery to CALLER <CALLER@myhost.test.ex> transport=t2
-  uid=CALLER_UID gid=CALLER_GID pid=pppp
-local-accept-delivery forked for delivery-local: npppp
+  uid=CALLER_UID gid=CALLER_GID pid=p1239
 LOG: MAIN
   => CALLER <CALLER@myhost.test.ex> R=caller T=t2
 changed uid/gid: post-delivery tidying
-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1238
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1240
 seeking password data for user "root": cache not available
 getpwnam() succeeded uid=uuuu gid=gggg
 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=p1240
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 seeking password data for user "root": cache not available
 getpwnam() succeeded uid=uuuu gid=gggg
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
-fresh-exec forking for local-accept-delivery
-postfork: local-accept-delivery
-fresh-exec forked for local-accept-delivery: npppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=EXIM_GID pid=pppp
+  uid=uuuu gid=EXIM_GID pid=p1241
 seeking password data for user "root": cache not available
 getpwnam() succeeded uid=uuuu gid=gggg
 configuration file is TESTSUITE/test-config
@@ -131,12 +110,9 @@ seeking password data for user "root": cache not available
 getpwnam() succeeded uid=uuuu gid=gggg
 LOG: MAIN PANIC
   User 0 set for t3 transport is on the never_users list
-local-accept-delivery forking for logfile-create
-postfork: logfile-create
-local-accept-delivery forked for logfile-create: npppp
 LOG: MAIN
   == never@myhost.test.ex R=never T=t3 defer (-29): User 0 set for t3 transport is on the never_users list
 changed uid/gid: post-delivery tidying
-  uid=EXIM_UID gid=EXIM_GID pid=pppp
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+  uid=EXIM_UID gid=EXIM_GID pid=p1241
+>>>>>>>>>>>>>>>> Exim pid=p1241 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>