X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0d2e392e281e96d9f9f2f3dd438affe3f2563c57..114b01dded2c9d72cdd44cac97a4d3cc9f22ddfd:/test/stderr/0361 diff --git a/test/stderr/0361 b/test/stderr/0361 index 8f5ef0b2b..7a4f90d9a 100644 --- a/test/stderr/0361 +++ b/test/stderr/0361 @@ -1,17 +1,17 @@ LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss -delivering 10HmaX-0005vi-00 +delivering 10HmaX-000000005vi-0000 LOG: MAIN *> miles R=r4 T=t2 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,35 +25,36 @@ Recipients: search_tidyup called >>Headers received: -rewrite_one_header: type=F: - From: CALLER_NAME +qualify & rewrite recipients list +rewrite rules on sender address +qualify and rewrite headers + rewrite_one_header: type=F: + From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D -Data file written for message 10HmaY-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D +Data file written for message 10HmaY-000000005vi-0000 >>Generated Received: header line 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 -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 + id 10HmaY-000000005vi-0000 + for kilos@recurse.test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-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-000000005vi-0000 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 @@ -61,17 +62,17 @@ dropping to exim gid; retaining priv uid seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaY-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaY-0005vi-00-D -reading spool file 10HmaY-0005vi-00-H +set_process_info: pppp delivering 10HmaY-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaY-000000005vi-0000-D +reading spool file 10HmaY-000000005vi-0000-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 @@ -92,18 +93,25 @@ routing kilos@recurse.test.ex --------> r1 router <-------- local_part=kilos domain=recurse.test.ex checking domains +recurse.test.ex in "!thishost.test.ex : !recurse.test.ex.test.ex"? + list element: !thishost.test.ex + list element: !recurse.test.ex.test.ex recurse.test.ex in "!thishost.test.ex : !recurse.test.ex.test.ex"? yes (end of list) calling r1 router r1 router called for kilos@recurse.test.ex domain = recurse.test.ex -recurse.test.ex in "*"? yes (matched "*") +recurse.test.ex in "*"? + list element: * + 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 "*") +recurse.test.ex.test.ex in "*"? + list element: * + 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 @@ -136,17 +144,24 @@ routing kilos@recurse.test.ex.test.ex --------> r1 router <-------- local_part=kilos domain=recurse.test.ex.test.ex checking domains -recurse.test.ex.test.ex in "!thishost.test.ex : !recurse.test.ex.test.ex"? no (matched "!recurse.test.ex.test.ex") +recurse.test.ex.test.ex in "!thishost.test.ex : !recurse.test.ex.test.ex"? + list element: !thishost.test.ex + list element: !recurse.test.ex.test.ex + recurse.test.ex.test.ex in "!thishost.test.ex : !recurse.test.ex.test.ex"? no (matched "!recurse.test.ex.test.ex") r1 router skipped: domains mismatch --------> r2 router <-------- local_part=kilos domain=recurse.test.ex.test.ex checking local_parts +kilos in "miles"? + list element: miles kilos in "miles"? no (end of list) r2 router skipped: local_parts mismatch --------> r3 router <-------- local_part=kilos domain=recurse.test.ex.test.ex checking local_parts -kilos in "kilos"? yes (matched "kilos") +kilos in "kilos"? + list element: kilos + kilos in "kilos"? yes (matched "kilos") calling r3 router rda_interpret (string): '$local_part@$domain' expanded: 'kilos@recurse.test.ex.test.ex' (tainted) @@ -176,11 +191,16 @@ routing kilos@recurse.test.ex.test.ex --------> r1 router <-------- local_part=kilos domain=recurse.test.ex.test.ex checking domains -recurse.test.ex.test.ex in "!thishost.test.ex : !recurse.test.ex.test.ex"? no (matched "!recurse.test.ex.test.ex") +recurse.test.ex.test.ex in "!thishost.test.ex : !recurse.test.ex.test.ex"? + list element: !thishost.test.ex + list element: !recurse.test.ex.test.ex + recurse.test.ex.test.ex in "!thishost.test.ex : !recurse.test.ex.test.ex"? no (matched "!recurse.test.ex.test.ex") r1 router skipped: domains mismatch --------> r2 router <-------- local_part=kilos domain=recurse.test.ex.test.ex checking local_parts +kilos in "miles"? + list element: miles kilos in "miles"? no (end of list) r2 router skipped: local_parts mismatch --------> r3 router <-------- @@ -194,7 +214,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 @@ -216,9 +236,9 @@ 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 +set_process_info: pppp delivering 10HmaY-000000005vi-0000 to kilos using t2 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=/dev/null format=unix @@ -238,8 +258,8 @@ LOG: MAIN *> kilos R=r4 T=t2 >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying - uid=EXIM_UID gid=EXIM_GID pid=pppp -set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 + uid=EXIM_UID gid=EXIM_GID pid=p1235 +set_process_info: pppp tidying up after delivering 10HmaY-000000005vi-0000 DSN: processing router : r4 DSN: processing successful delivery address: kilos@recurse.test.ex.test.ex DSN: Sender_address: CALLER@test.ex @@ -258,9 +278,9 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaY-0005vi-00 +end delivery of 10HmaY-000000005vi-0000 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 >>>>>>>>>>>>>>>>