Make {bounce,warn}_message_file expanded. Bug 2522

[exim.git] / test / stderr / 0403

diff --git a/test/stderr/0403 b/test/stderr/0403
index ec8ebde39616da227b66b80bc7c1de36391589f4..5d4223268f48afe412594758c6289b0c2548a6e1 100644 (file)
--- a/test/stderr/0403
+++ b/test/stderr/0403
@@ -44,8 +44,6 @@ LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
-fresh-exec forking for local-accept-delivery
-fresh-exec forked for local-accept-delivery: npppp
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -N -odi -Mc 10HmaX-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
@@ -91,12 +89,12 @@ local_part=userx domain=test.ex
 checking domains
 search_open: lsearch "TESTSUITE/aux-fixed/0403.data"
 search_find: file="TESTSUITE/aux-fixed/0403.data"
-  key="test.ex" partial=-1 affix=NULL starflags=0
+  key="test.ex" partial=-1 affix=NULL starflags=0 opts=NULL
 LRU list:
   0TESTSUITE/aux-fixed/0403.data
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0403.data"
-  type=lsearch key="test.ex"
+  type=lsearch key="test.ex" opts=NULL
 file lookup required for test.ex
   in TESTSUITE/aux-fixed/0403.data
 lookup yielded: [DOMAINDATA_test.ex]
@@ -105,12 +103,12 @@ checking local_parts
 search_open: lsearch "TESTSUITE/aux-fixed/0403.data"
   cached open
 search_find: file="TESTSUITE/aux-fixed/0403.data"
-  key="userx" partial=-1 affix=NULL starflags=0
+  key="userx" partial=-1 affix=NULL starflags=0 opts=NULL
 LRU list:
   0TESTSUITE/aux-fixed/0403.data
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0403.data"
-  type=lsearch key="userx"
+  type=lsearch key="userx" opts=NULL
 file lookup required for userx
   in TESTSUITE/aux-fixed/0403.data
 lookup yielded: [LOCALPARTDATA_userx]
@@ -162,8 +160,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
-local-accept-delivery forked for delivery-local: npppp
 changed uid/gid: local delivery to TESTSUITE/test-mail/junk <TESTSUITE/test-mail/junk> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=/usr current=/usr