X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/836c3e4102dae52604590a6674bec10087dbf17e..2c09c380e6ba3b1d694359e6ae2437d1a7a8ac81:/test/stderr/0278?ds=sidebyside

diff --git a/test/stderr/0278 b/test/stderr/0278
index 58fb5e3fc..60abd2a29 100644
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -21,6 +21,7 @@ checking local_parts
 CALLER in "never"? no (end of list)
 CALLER in "never1"? no (end of list)
 CALLER in "CALLER"? yes (matched "CALLER")
+data from lookup saved for cache for +local_localparts: key 'CALLER' value 'CALLER'
 CALLER in "+never_localparts : +n1_localparts : ! +local_localparts"? no (matched "! +local_localparts")
 r1 router skipped: local_parts mismatch
 --------> r2 router <--------
@@ -32,14 +33,14 @@ cached no match for +n1_localparts
 cached lookup data = NULL
 CALLER in "<; never2 ; +n1_localparts"? no (end of list)
 cached yes match for +local_localparts
-cached lookup data = NULL
+cached lookup data = CALLER
 CALLER in "+never_localparts : +n2_localparts : !+local_localparts"? no (matched "!+local_localparts" - cached)
 r2 router skipped: local_parts mismatch
 --------> r3 router <--------
 local_part=CALLER domain=test.ex
 checking local_parts
 cached yes match for +local_localparts
-cached lookup data = NULL
+cached lookup data = CALLER
 CALLER in "+local_localparts"? yes (matched "+local_localparts" - cached)
 checking for local user
 seeking password data for user "CALLER": using cached result
@@ -51,7 +52,7 @@ set transport t1
 queued for t1 transport: local_part = CALLER
 domain = test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL localpart_data=CALLER
 routed by r3 router
   envelope to: CALLER@test.ex
   transport: t1
@@ -93,9 +94,6 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 	id 10HmaX-0005vi-00
 	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
-DSN: Write SPOOL: -dsn_envid NULL
-DSN: Write SPOOL  :-dsn_ret 0
-DSN: Flags: 0x0
 DSN: **** SPOOL_OUT - address: <CALLER@test.ex> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
 Size of headers = sss
@@ -103,8 +101,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 -odi -Mc 10HmaX-0005vi-00
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
@@ -151,6 +147,7 @@ checking local_parts
 CALLER in "never"? no (end of list)
 CALLER in "never1"? no (end of list)
 CALLER in "CALLER"? yes (matched "CALLER")
+data from lookup saved for cache for +local_localparts: key 'CALLER' value 'CALLER'
 CALLER in "+never_localparts : +n1_localparts : ! +local_localparts"? no (matched "! +local_localparts")
 r1 router skipped: local_parts mismatch
 --------> r2 router <--------
@@ -162,14 +159,14 @@ cached no match for +n1_localparts
 cached lookup data = NULL
 CALLER in "<; never2 ; +n1_localparts"? no (end of list)
 cached yes match for +local_localparts
-cached lookup data = NULL
+cached lookup data = CALLER
 CALLER in "+never_localparts : +n2_localparts : !+local_localparts"? no (matched "!+local_localparts" - cached)
 r2 router skipped: local_parts mismatch
 --------> r3 router <--------
 local_part=CALLER domain=test.ex
 checking local_parts
 cached yes match for +local_localparts
-cached lookup data = NULL
+cached lookup data = CALLER
 CALLER in "+local_localparts"? yes (matched "+local_localparts" - cached)
 checking for local user
 seeking password data for user "CALLER": using cached result
@@ -181,7 +178,7 @@ set transport t1
 queued for t1 transport: local_part = CALLER
 domain = test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL localpart_data=CALLER
 routed by r3 router
   envelope to: CALLER@test.ex
   transport: t1
@@ -202,8 +199,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 CALLER <CALLER@test.ex> transport=t1
   uid=CALLER_UID gid=CALLER_GID pid=pppp
   home=CALLER_HOME current=CALLER_HOME