X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/979c462ed43bd4f53f61a0031ec22967dea83902..340e5f5781abb5388c41fa326d6e1cabf7ba96ff:/test/stderr/0361 diff --git a/test/stderr/0361 b/test/stderr/0361 index 0e5ef679a..dd2259ca8 100644 --- a/test/stderr/0361 +++ b/test/stderr/0361 @@ -7,11 +7,11 @@ LOG: MAIN Completed 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 @@ -25,8 +25,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: @@ -39,21 +42,19 @@ Data file written for message 10HmaY-0005vi-00 P Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) 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: errorsto: orcpt: 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 -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -N -odi -Mc 10HmaY-0005vi-00 +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 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 @@ -67,11 +68,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 @@ -100,12 +101,14 @@ recurse.test.ex in "*"? yes (matched "*") DNS lookup of recurse.test.ex (MX) using fakens DNS lookup of recurse.test.ex (MX) gave HOST_NOT_FOUND returning DNS_NOMATCH +faking res_search(MX) response length as 65535 writing neg-cache entry for recurse.test.ex-MX-xxxx, ttl 3000 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 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 DNS lookup of recurse.test.ex.test.ex (A) using fakens @@ -147,7 +150,7 @@ checking local_parts kilos in "kilos"? yes (matched "kilos") calling r3 router rda_interpret (string): '$local_part@$domain' -expanded: 'kilos@recurse.test.ex.test.ex' +expanded: 'kilos@recurse.test.ex.test.ex' (tainted) file is not a filter file parse_forward_list: kilos@recurse.test.ex.test.ex extract item: kilos@recurse.test.ex.test.ex @@ -192,7 +195,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 @@ -214,7 +217,7 @@ search_tidyup called no retry data available search_tidyup called changed uid/gid: local delivery to kilos transport=t2 - uid=CALLER_UID gid=CALLER_GID pid=pppp + uid=CALLER_UID gid=CALLER_GID pid=p1236 home=NULL current=/ set_process_info: pppp delivering 10HmaY-0005vi-00 to kilos using t2 appendfile transport entered @@ -236,7 +239,7 @@ LOG: MAIN *> kilos R=r4 T=t2 >>>>>>>>>>>>>>>> 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 10HmaY-0005vi-00 DSN: processing router : r4 DSN: processing successful delivery address: kilos@recurse.test.ex.test.ex @@ -259,6 +262,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=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>