X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0c6608531368096bafebac4e488f84891368b006..0585799ba85d257f1e2428c1615b00c30c60931e:/test/stderr/0275?ds=sidebyside diff --git a/test/stderr/0275 b/test/stderr/0275 index 0bef81f35..0c0ca3e65 100644 --- a/test/stderr/0275 +++ b/test/stderr/0275 @@ -17,7 +17,7 @@ test.ex in percent_hack_domains? list element: +hold_domains start sublist hold_domains test.ex in "! *.ex"? - ╎list element: ! *.ex + ╎list element: !░*.ex ╎test.ex in "! *.ex"? no (matched "! *.ex") end sublist hold_domains list element: +not_queue_domains @@ -32,31 +32,31 @@ routing userx@test.ex --------> r00 router <-------- local_part=userx domain=test.ex checking domains -test.ex in "+nocache"? +test.ex in domains? list element: +nocache start sublist nocache test.ex in "userx"? ╎list element: userx test.ex in "userx"? no (end of list) end sublist nocache -test.ex in "+nocache"? no (end of list) +test.ex in domains? no (end of list) r00 router skipped: domains mismatch --------> r01 router <-------- local_part=userx domain=test.ex checking domains -test.ex in "+nocache"? +test.ex in domains? list element: +nocache start sublist nocache test.ex in "userx"? ╎list element: userx test.ex in "userx"? no (end of list) end sublist nocache -test.ex in "+nocache"? no (end of list) +test.ex in domains? no (end of list) r01 router skipped: domains mismatch --------> r02 router <-------- local_part=userx domain=test.ex checking domains -test.ex in "+nocache2"? +test.ex in domains? list element: +nocache2 start sublist nocache2 test.ex in "+nocache"? @@ -68,12 +68,12 @@ test.ex in "+nocache2"? ╎ end sublist nocache test.ex in "+nocache"? no (end of list) end sublist nocache2 -test.ex in "+nocache2"? no (end of list) +test.ex in domains? no (end of list) r02 router skipped: domains mismatch --------> r03 router <-------- local_part=userx domain=test.ex checking domains -test.ex in "+nocache2"? +test.ex in domains? list element: +nocache2 start sublist nocache2 test.ex in "+nocache"? @@ -85,34 +85,34 @@ test.ex in "+nocache2"? ╎ end sublist nocache test.ex in "+nocache"? no (end of list) end sublist nocache2 -test.ex in "+nocache2"? no (end of list) +test.ex in domains? no (end of list) r03 router skipped: domains mismatch --------> r04 router <-------- local_part=userx domain=test.ex checking domains -test.ex in "+forcecache"? +test.ex in domains? list element: +forcecache start sublist forcecache test.ex in "userx"? ╎list element: userx test.ex in "userx"? no (end of list) end sublist forcecache -test.ex in "+forcecache"? no (end of list) +test.ex in domains? no (end of list) r04 router skipped: domains mismatch --------> r05 router <-------- local_part=userx domain=test.ex checking domains -test.ex in "+forcecache"? +test.ex in domains? list element: +forcecache start sublist forcecache cached no match for +forcecache cached lookup data = NULL -test.ex in "+forcecache"? no (end of list) +test.ex in domains? no (end of list) r05 router skipped: domains mismatch --------> r1 router <-------- local_part=userx domain=test.ex checking domains -test.ex in "+never_domains : +n1_domains : ! +local_domains"? +test.ex in domains? list element: +never_domains start sublist never_domains test.ex in "never.ex"? @@ -125,19 +125,19 @@ test.ex in "+never_domains : +n1_domains : ! +local_domains"? ╎list element: never1.ex test.ex in "never1.ex"? no (end of list) end sublist n1_domains - list element: ! +local_domains + list element: !░+local_domains start sublist local_domains test.ex in "test.ex"? ╎list element: test.ex ╎test.ex in "test.ex"? yes (matched "test.ex") end sublist local_domains 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") + test.ex in domains? no (matched "! +local_domains") r1 router skipped: domains mismatch --------> r2 router <-------- local_part=userx domain=test.ex checking domains -test.ex in "+never_domains : +n2_domains : !+local_domains"? +test.ex in domains? list element: +never_domains start sublist never_domains cached no match for +never_domains @@ -156,21 +156,21 @@ test.ex in "+never_domains : +n2_domains : !+local_domains"? start sublist local_domains cached yes match for +local_domains cached lookup data = test.ex - test.ex in "+never_domains : +n2_domains : !+local_domains"? no (matched "!+local_domains" - cached) + test.ex in domains? no (matched "!+local_domains" - cached) r2 router skipped: domains mismatch --------> r3 router <-------- local_part=userx domain=test.ex checking domains -test.ex in "+local_domains"? +test.ex in domains? list element: +local_domains start sublist local_domains cached yes match for +local_domains cached lookup data = test.ex - test.ex in "+local_domains"? yes (matched "+local_domains" - cached) + test.ex in domains? yes (matched "+local_domains" - cached) checking local_parts -userx in "userx"? +userx in local_parts? list element: userx - userx in "userx"? yes (matched "userx") + userx in local_parts? yes (matched "userx") calling r3 router r3 router called for userx@test.ex domain = test.ex @@ -205,33 +205,33 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +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//10HmaX-0005vi-00-D -Data file written for message 10HmaX-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 DSN: **** SPOOL_OUT - address: errorsto: orcpt: dsn_flags: 0x0 -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-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 -MCd local-accept-delivery -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-000000005vi-0000 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1236 @@ -242,9 +242,9 @@ 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 10HmaX-0005vi-00 -Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D -reading spool file 10HmaX-0005vi-00-H +set_process_info: pppp delivering 10HmaX-000000005vi-0000 +Trying spool file TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +reading spool file 10HmaX-000000005vi-0000-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER Non-recipients: @@ -268,7 +268,7 @@ test.ex in percent_hack_domains? list element: +hold_domains start sublist hold_domains test.ex in "! *.ex"? - ╎list element: ! *.ex + ╎list element: !░*.ex ╎test.ex in "! *.ex"? no (matched "! *.ex") end sublist hold_domains list element: +not_queue_domains @@ -297,31 +297,31 @@ routing userx@test.ex --------> r00 router <-------- local_part=userx domain=test.ex checking domains -test.ex in "+nocache"? +test.ex in domains? list element: +nocache start sublist nocache test.ex in "userx"? ╎list element: userx test.ex in "userx"? no (end of list) end sublist nocache -test.ex in "+nocache"? no (end of list) +test.ex in domains? no (end of list) r00 router skipped: domains mismatch --------> r01 router <-------- local_part=userx domain=test.ex checking domains -test.ex in "+nocache"? +test.ex in domains? list element: +nocache start sublist nocache test.ex in "userx"? ╎list element: userx test.ex in "userx"? no (end of list) end sublist nocache -test.ex in "+nocache"? no (end of list) +test.ex in domains? no (end of list) r01 router skipped: domains mismatch --------> r02 router <-------- local_part=userx domain=test.ex checking domains -test.ex in "+nocache2"? +test.ex in domains? list element: +nocache2 start sublist nocache2 test.ex in "+nocache"? @@ -333,12 +333,12 @@ test.ex in "+nocache2"? ╎ end sublist nocache test.ex in "+nocache"? no (end of list) end sublist nocache2 -test.ex in "+nocache2"? no (end of list) +test.ex in domains? no (end of list) r02 router skipped: domains mismatch --------> r03 router <-------- local_part=userx domain=test.ex checking domains -test.ex in "+nocache2"? +test.ex in domains? list element: +nocache2 start sublist nocache2 test.ex in "+nocache"? @@ -350,34 +350,34 @@ test.ex in "+nocache2"? ╎ end sublist nocache test.ex in "+nocache"? no (end of list) end sublist nocache2 -test.ex in "+nocache2"? no (end of list) +test.ex in domains? no (end of list) r03 router skipped: domains mismatch --------> r04 router <-------- local_part=userx domain=test.ex checking domains -test.ex in "+forcecache"? +test.ex in domains? list element: +forcecache start sublist forcecache test.ex in "userx"? ╎list element: userx test.ex in "userx"? no (end of list) end sublist forcecache -test.ex in "+forcecache"? no (end of list) +test.ex in domains? no (end of list) r04 router skipped: domains mismatch --------> r05 router <-------- local_part=userx domain=test.ex checking domains -test.ex in "+forcecache"? +test.ex in domains? list element: +forcecache start sublist forcecache cached no match for +forcecache cached lookup data = NULL -test.ex in "+forcecache"? no (end of list) +test.ex in domains? no (end of list) r05 router skipped: domains mismatch --------> r1 router <-------- local_part=userx domain=test.ex checking domains -test.ex in "+never_domains : +n1_domains : ! +local_domains"? +test.ex in domains? list element: +never_domains start sublist never_domains test.ex in "never.ex"? @@ -390,19 +390,19 @@ test.ex in "+never_domains : +n1_domains : ! +local_domains"? ╎list element: never1.ex test.ex in "never1.ex"? no (end of list) end sublist n1_domains - list element: ! +local_domains + list element: !░+local_domains start sublist local_domains test.ex in "test.ex"? ╎list element: test.ex ╎test.ex in "test.ex"? yes (matched "test.ex") end sublist local_domains 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") + test.ex in domains? no (matched "! +local_domains") r1 router skipped: domains mismatch --------> r2 router <-------- local_part=userx domain=test.ex checking domains -test.ex in "+never_domains : +n2_domains : !+local_domains"? +test.ex in domains? list element: +never_domains start sublist never_domains cached no match for +never_domains @@ -421,21 +421,21 @@ test.ex in "+never_domains : +n2_domains : !+local_domains"? start sublist local_domains cached yes match for +local_domains cached lookup data = test.ex - test.ex in "+never_domains : +n2_domains : !+local_domains"? no (matched "!+local_domains" - cached) + test.ex in domains? no (matched "!+local_domains" - cached) r2 router skipped: domains mismatch --------> r3 router <-------- local_part=userx domain=test.ex checking domains -test.ex in "+local_domains"? +test.ex in domains? list element: +local_domains start sublist local_domains cached yes match for +local_domains cached lookup data = test.ex - test.ex in "+local_domains"? yes (matched "+local_domains" - cached) + test.ex in domains? yes (matched "+local_domains" - cached) checking local_parts -userx in "userx"? +userx in local_parts? list element: userx - userx in "userx"? yes (matched "userx") + userx in local_parts? yes (matched "userx") calling r3 router r3 router called for userx@test.ex domain = test.ex @@ -467,7 +467,7 @@ search_tidyup called changed uid/gid: local delivery to userx transport=t1 uid=CALLER_UID gid=CALLER_GID pid=p1237 home=NULL current=/ -set_process_info: pppp delivering 10HmaX-0005vi-00 to userx using t1 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to userx using t1 appendfile transport entered appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=/dev/null format=unix @@ -485,7 +485,7 @@ LOG: MAIN >>>>>>>>>>>>>>>> deliveries are done >>>>>>>>>>>>>>>> changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1236 -set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Processing retry items Succeeded addresses: userx@test.ex: no retry items @@ -502,7 +502,7 @@ DSN: Remote SMTP server supports DSN: 0 DSN: not sending DSN success message LOG: MAIN Completed -end delivery of 10HmaX-0005vi-00 +end delivery of 10HmaX-000000005vi-0000 search_tidyup called search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -552,7 +552,7 @@ test.ex in percent_hack_domains? list element: +hold_domains start sublist hold_domains test.ex in "! *.ex"? - ╎list element: ! *.ex + ╎list element: !░*.ex ╎test.ex in "! *.ex"? no (matched "! *.ex") end sublist hold_domains list element: +not_queue_domains @@ -581,12 +581,12 @@ routing error@test.ex --------> r0f router <-------- local_part=error domain=test.ex checking domains -test.ex in "+no_such_list"? +test.ex in domains? list element: +no_such_list start sublist no_such_list LOG: MAIN PANIC unknown named domain list "+no_such_list" - test.ex in "+no_such_list"? list match deferred for +no_such_list + test.ex in domains? list match deferred for +no_such_list domains check lookup or other defer ----------- end verify ------------ accept: condition test deferred in inline ACL @@ -596,6 +596,6 @@ LOG: MAIN REJECT SMTP<< QUIT SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN - SMTP connection from (test) [127.0.0.1] closed by QUIT + SMTP connection from (test) [127.0.0.1] D=qqs closed by QUIT search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>