Merge branch 'hs/fix-proxy-bh' (Closes 2656)

[exim.git] / test / stderr / 0543

diff --git a/test/stderr/0543 b/test/stderr/0543
index b136412eaecda28eaef63f932ce717b7e0ec4592..4a12a9b90862a61f7427fcf2e262729c7ac4965a 100644 (file)
--- a/test/stderr/0543
+++ b/test/stderr/0543
@@ -4,8 +4,6 @@ admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@domain1
@@ -22,7 +20,7 @@ set transport smtp
 queued for smtp transport: local_part = userx
 domain = domain1
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by smarthost router
   envelope to: userx@domain1
   transport: smtp
@@ -33,16 +31,6 @@ After routing:
     userx@domain1
   Failed addresses:
   Deferred addresses:
-qrun delivery forking for transport
-postfork: transport
-transport forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
-transport forked for fakens-search: npppp
-transport forking for fakens-search
-postfork: fakens-search
-transport forked for fakens-search: npppp
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-smtp.lockfile
 LOG: MAIN
@@ -50,14 +38,12 @@ LOG: MAIN
 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forking for qrun delivery
-postfork: qrun delivery
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: usery@domain1
 unique = usery@domain1
 LOG: retry_defer MAIN
-  == usery@domain1 routing defer (-51): retry time not reached
+  == usery@domain1 routing defer (-52): retry time not reached
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 After routing:
   Local deliveries:
@@ -66,7 +52,6 @@ After routing:
   Deferred addresses:
     usery@domain1
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
-fresh-exec forked for qrun delivery: npppp
 LOG: queue_run MAIN
   End queue run: pid=pppp
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>