X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/4b424e0d861166cbe0faf3620f42b23247281c24..6d2c02560e5c0aa7cef83d02b26f193135b93e21:/test/stderr/0275 diff --git a/test/stderr/0275 b/test/stderr/0275 index 4b6e3261f..b14b6d911 100644 --- a/test/stderr/0275 +++ b/test/stderr/0275 @@ -63,6 +63,7 @@ checking domains test.ex in "never.ex"? no (end of list) test.ex in "never1.ex"? no (end of list) test.ex in "test.ex"? yes (matched "test.ex") +data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex' test.ex in "+never_domains : +n1_domains : ! +local_domains"? no (matched "! +local_domains") r1 router skipped: domains mismatch --------> r2 router <-------- @@ -74,14 +75,14 @@ cached no match for +n1_domains cached lookup data = NULL test.ex in "<; never2.ex ; +n1_domains"? no (end of list) cached yes match for +local_domains -cached lookup data = NULL +cached lookup data = test.ex test.ex in "+never_domains : +n2_domains : !+local_domains"? no (matched "!+local_domains" - cached) r2 router skipped: domains mismatch --------> r3 router <-------- local_part=userx domain=test.ex checking domains cached yes match for +local_domains -cached lookup data = NULL +cached lookup data = test.ex test.ex in "+local_domains"? yes (matched "+local_domains" - cached) checking local_parts userx in "userx"? yes (matched "userx") @@ -92,12 +93,12 @@ set transport t1 queued for t1 transport: local_part = userx domain = test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=test.ex local_part_data=userx routed by r3 router envelope to: userx@test.ex transport: t1 search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp @@ -118,8 +119,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: @@ -132,19 +136,17 @@ Data file written for message 10HmaX-0005vi-00 P Received: from CALLER by myhost.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 :0 -DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -odi -Mc 10HmaX-0005vi-00 +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 uid=uuuu gid=EXIM_GID pid=pppp @@ -161,20 +163,19 @@ 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 -DSN: set orcpt: flags: 0 +body_linecount=0 message_linecount=8 +DSN: set orcpt: flags: 0x0 Delivery address list: userx@test.ex locking TESTSUITE/spool/db/retry.lockfile 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 @@ -236,6 +237,7 @@ checking domains test.ex in "never.ex"? no (end of list) test.ex in "never1.ex"? no (end of list) test.ex in "test.ex"? yes (matched "test.ex") +data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex' test.ex in "+never_domains : +n1_domains : ! +local_domains"? no (matched "! +local_domains") r1 router skipped: domains mismatch --------> r2 router <-------- @@ -247,14 +249,14 @@ cached no match for +n1_domains cached lookup data = NULL test.ex in "<; never2.ex ; +n1_domains"? no (end of list) cached yes match for +local_domains -cached lookup data = NULL +cached lookup data = test.ex test.ex in "+never_domains : +n2_domains : !+local_domains"? no (matched "!+local_domains" - cached) r2 router skipped: domains mismatch --------> r3 router <-------- local_part=userx domain=test.ex checking domains cached yes match for +local_domains -cached lookup data = NULL +cached lookup data = test.ex test.ex in "+local_domains"? yes (matched "+local_domains" - cached) checking local_parts userx in "userx"? yes (matched "userx") @@ -265,7 +267,7 @@ set transport t1 queued for t1 transport: local_part = userx domain = test.ex errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=test.ex local_part_data=userx routed by r3 router envelope to: userx@test.ex transport: t1 @@ -317,7 +319,7 @@ end of retry processing DSN: processing router : r3 DSN: processing successful delivery address: userx@test.ex DSN: Sender_address: CALLER@test.ex -DSN: orcpt: NULL flags: 0 +DSN: orcpt: NULL flags: 0x0 DSN: envid: NULL ret: 0 DSN: Final recipient: userx@test.ex DSN: Remote SMTP server supports DSN: 0 @@ -327,9 +329,9 @@ LOG: MAIN end delivery of 10HmaX-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 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp @@ -397,4 +399,4 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from (test) [127.0.0.1] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>