X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/836c3e4102dae52604590a6674bec10087dbf17e..caf28f95ce0a:/test/stderr/0403?ds=sidebyside diff --git a/test/stderr/0403 b/test/stderr/0403 index ec8ebde39..e479b0c54 100644 --- a/test/stderr/0403 +++ b/test/stderr/0403 @@ -1,10 +1,10 @@ Exim version x.yz .... changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp + uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1234 seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME @@ -18,8 +18,11 @@ Recipients: search_tidyup called >>Headers received: -rewrite_one_header: type=F: - From: CALLER_NAME +qualify & rewrite recipients list +global rewrite rules +rewrite headers + rewrite_one_header: type=F: + From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: I Message-Id: @@ -32,11 +35,9 @@ Data file written for message 10HmaX-0005vi-00 P Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 + for userx@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: errorsto: orcpt: dsn_flags: 0x0 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss @@ -44,12 +45,10 @@ 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 - uid=uuuu gid=EXIM_GID pid=pppp + uid=uuuu gid=EXIM_GID pid=p1235 configuration file is TESTSUITE/test-config trusted user admin user @@ -63,11 +62,11 @@ reading spool file 10HmaX-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: userx@test.ex @@ -75,8 +74,7 @@ Delivery address list: locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN: file dir flags=O_RDONLY returned from EXIM_DBOPEN: (nil) - ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim - failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex @@ -89,32 +87,38 @@ routing userx@test.ex --------> r1 router <-------- 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 -LRU list: - 0TESTSUITE/aux-fixed/0403.data - End -internal_search_find: file="TESTSUITE/aux-fixed/0403.data" - type=lsearch key="test.ex" -file lookup required for test.ex - in TESTSUITE/aux-fixed/0403.data -lookup yielded: [DOMAINDATA_test.ex] -test.ex in "lsearch;TESTSUITE/aux-fixed/0403.data"? yes (matched "lsearch;TESTSUITE/aux-fixed/0403.data") +test.ex in "lsearch;TESTSUITE/aux-fixed/0403.data"? + list element: lsearch;TESTSUITE/aux-fixed/0403.data + 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 opts=NULL + LRU list: + 0TESTSUITE/aux-fixed/0403.data + End + internal_search_find: file="TESTSUITE/aux-fixed/0403.data" + type=lsearch key="test.ex" opts=NULL + file lookup required for test.ex + in TESTSUITE/aux-fixed/0403.data + creating new cache entry + lookup yielded: [DOMAINDATA_test.ex] + test.ex in "lsearch;TESTSUITE/aux-fixed/0403.data"? yes (matched "lsearch;TESTSUITE/aux-fixed/0403.data") 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 -LRU list: - 0TESTSUITE/aux-fixed/0403.data - End -internal_search_find: file="TESTSUITE/aux-fixed/0403.data" - type=lsearch key="userx" -file lookup required for userx - in TESTSUITE/aux-fixed/0403.data -lookup yielded: [LOCALPARTDATA_userx] -userx in "lsearch;TESTSUITE/aux-fixed/0403.data"? yes (matched "lsearch;TESTSUITE/aux-fixed/0403.data") +userx in "lsearch;TESTSUITE/aux-fixed/0403.data"? + list element: lsearch;TESTSUITE/aux-fixed/0403.data + 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 opts=NULL + LRU list: + 0TESTSUITE/aux-fixed/0403.data + End + internal_search_find: file="TESTSUITE/aux-fixed/0403.data" + type=lsearch key="userx" opts=NULL + file lookup required for userx + in TESTSUITE/aux-fixed/0403.data + creating new cache entry + lookup yielded: [LOCALPARTDATA_userx] + userx in "lsearch;TESTSUITE/aux-fixed/0403.data"? yes (matched "lsearch;TESTSUITE/aux-fixed/0403.data") +++ROUTER: +++domain_data=[DOMAINDATA_test.ex] +++local_part_data=[LOCALPARTDATA_userx] @@ -162,10 +166,8 @@ 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 transport=t1 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1236 home=/usr current=/usr set_process_info: pppp delivering 10HmaX-0005vi-00 to TESTSUITE/test-mail/junk using t1 +++TRANSPORT: @@ -191,7 +193,7 @@ LOG: MAIN *> TESTSUITE/test-mail/junk R=r1 T=t1 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp + uid=EXIM_UID gid=EXIM_GID pid=p1235 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 DSN: processing router : r1 DSN: processing successful delivery address: TESTSUITE/test-mail/junk @@ -214,6 +216,6 @@ LOG: MAIN end delivery of 10HmaX-0005vi-00 search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>