Fix error message for multiple authenticators misconfiguration. Bug 2817

[exim.git] / test / stderr / 0361

diff --git a/test/stderr/0361 b/test/stderr/0361
index 25bbabac9194f081ba9eb9ea4ca6dd94a0219c69..e77090a216aaa9ea1a4930dd18363397d6676500 100644 (file)
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -39,21 +39,16 @@ Data file written for message 10HmaY-0005vi-00
 P Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
-       for kilos@recurse.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       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
-postfork: 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
@@ -70,11 +65,11 @@ reading spool file 10HmaY-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex
 sender_local=1 ident=CALLER
 Non-recipients:
-Empty Tree
+ Empty Tree
 ---- End of tree ----
 recipients_count=1
 **** SPOOL_IN - No additional fields
-body_linecount=0 message_linecount=7
+body_linecount=0 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   kilos@recurse.test.ex 
@@ -101,9 +96,6 @@ r1 router called for kilos@recurse.test.ex
   domain = recurse.test.ex
 recurse.test.ex in "*"? yes (matched "*")
 DNS lookup of recurse.test.ex (MX) using fakens
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
 DNS lookup of recurse.test.ex (MX) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
 faking res_search(MX) response length as 65535
@@ -111,21 +103,12 @@ faking res_search(MX) response length as 65535
 r1 router widened recurse.test.ex to recurse.test.ex.test.ex
 recurse.test.ex.test.ex in "*"? yes (matched "*")
 DNS lookup of recurse.test.ex.test.ex (MX) using fakens
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
 DNS lookup of recurse.test.ex.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
 faking res_search(MX) response length as 65535
  writing neg-cache entry for recurse.test.ex.test.ex-MX-xxxx, ttl 3000
 recurse.test.ex.test.ex (MX resp) DNSSEC
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
 DNS lookup of recurse.test.ex.test.ex (A) using fakens
-local-accept-delivery forking for fakens-search
-postfork: fakens-search
-local-accept-delivery forked for fakens-search: npppp
 DNS lookup of recurse.test.ex.test.ex (A) succeeded
 fully qualified name = recurse.test.ex.test.ex
 recurse.test.ex.test.ex V4NET.99.0.2 mx=-1 sort=xx 
@@ -209,7 +192,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
@@ -230,8 +213,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
-postfork: 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=/
@@ -245,7 +226,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)
@@ -279,6 +259,6 @@ LOG: MAIN
 end delivery of 10HmaY-0005vi-00
 search_tidyup called
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>