Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / stderr / 0361

diff --git a/test/stderr/0361 b/test/stderr/0361
index effaf03740863c38d1d48b11ea2eabde353a8837..5a57d33225c79cf44d47096fe8a718b4614bf22c 100644 (file)
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -41,18 +41,13 @@ P Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for kilos@recurse.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
-DSN: Write SPOOL: -dsn_envid NULL
-DSN: Write SPOOL  :-dsn_ret 0
-DSN: Flags: 0x0
 DSN: **** SPOOL_OUT - address: <kilos@recurse.test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 search_tidyup called
-fresh-exec forking for local-accept-delivery
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -N -odi -Mc 10HmaY-0005vi-00
-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
@@ -196,7 +191,7 @@ set transport t2
 queued for t2 transport: local_part = kilos
 domain = recurse.test.ex.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by r4 router
   envelope to: kilos@recurse.test.ex.test.ex
   transport: t2
@@ -217,7 +212,6 @@ search_tidyup called
  failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 no retry data available
 search_tidyup called
-local-accept-delivery forking for delivery-local
 changed uid/gid: local delivery to kilos <kilos@recurse.test.ex.test.ex> transport=t2
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=NULL current=/
@@ -231,7 +225,6 @@ appendfile: mode=600 notify_comsat=0 quota=0 warning=0
   locking by lockfile fcntl 
 *** delivery by t2 transport bypassed by -N option
 search_tidyup called
-local-accept-delivery forked for delivery-local: npppp
 journalling kilos@recurse.test.ex.test.ex/t2
 t2 transport returned OK for kilos@recurse.test.ex.test.ex
 post-process kilos@recurse.test.ex.test.ex (0)