DANE: Fix 2-rcpt message, diff domins case. Bug 2265

[exim.git] / test / stderr / 0543

diff --git a/test/stderr/0543 b/test/stderr/0543
index ef18299b83c572828c4ff24dff8a10dc84107a7f..ae605b2870138240458e0224f198c99203e64000 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
 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
 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
 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
 routed by smarthost router
   envelope to: userx@domain1
   transport: smtp


@@ -33,16 +31,6 @@ After routing:
     userx@domain1
   Failed addresses:
   Deferred addresses:
     userx@domain1
   Failed addresses:
   Deferred addresses:

-qrun delivery forking for transport
-postfork: transport
-transport forking for child-open
-postfork: child-open
-fresh-exec forked for qrun delivery: npppp
-qrun delivery forked for transport: npppp
-transport forked for child-open: npppp
-transport forking for child-open
-postfork: child-open
-transport forked for child-open: npppp

 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-smtp.lockfile
 LOG: MAIN
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-smtp.lockfile
 LOG: MAIN


@@ -50,8 +38,6 @@ LOG: MAIN
 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 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
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: usery@domain1


@@ -66,7 +52,6 @@ After routing:
   Deferred addresses:
     usery@domain1
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
   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
 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 >>>>>>>>>>>>>>>>