diff options
Diffstat (limited to 'test/stderr')
-rw-r--r-- | test/stderr/0084 | 4 | ||||
-rw-r--r-- | test/stderr/0085 | 6 | ||||
-rw-r--r-- | test/stderr/0297 | 4 | ||||
-rw-r--r-- | test/stderr/0361 | 2 | ||||
-rw-r--r-- | test/stderr/0364 | 14 | ||||
-rw-r--r-- | test/stderr/0377 | 14 | ||||
-rw-r--r-- | test/stderr/0378 | 6 | ||||
-rw-r--r-- | test/stderr/0379 | 2 | ||||
-rw-r--r-- | test/stderr/0380 | 4 | ||||
-rw-r--r-- | test/stderr/0464 | 4 | ||||
-rw-r--r-- | test/stderr/0584 | 1 |
11 files changed, 31 insertions, 30 deletions
diff --git a/test/stderr/0084 b/test/stderr/0084 index 02d86cee1..8e4d16ee0 100644 --- a/test/stderr/0084 +++ b/test/stderr/0084 @@ -17,9 +17,9 @@ file check: TESTSUITE/aux-fixed/0084.$local_part expanded file: TESTSUITE/aux-fixed/0084.yes stat() yielded 0 calling forward router -rda_interpret (file): 'TESTSUITE/aux-fixed/0084.$local_part' +rda_interpret (file): 'TESTSUITE/aux-fixed/0084.${bless:$local_part}' expanded: 'TESTSUITE/aux-fixed/0084.yes' -ssss (tainted) bytes read from TESTSUITE/aux-fixed/0084.yes +ssss bytes read from TESTSUITE/aux-fixed/0084.yes file is not a filter file parse_forward_list: userx@test.ex diff --git a/test/stderr/0085 b/test/stderr/0085 index 56c65f6b4..001ee066c 100644 --- a/test/stderr/0085 +++ b/test/stderr/0085 @@ -28,7 +28,7 @@ y.z in "test.ex : myhost.test.ex"? no (end of list) y.z in "! +local_domains"? yes (end of list) calling fail_remote_domains router rda_interpret (string): ':fail: unrouteable mail domain "$domain"' -expanded: ':fail: unrouteable mail domain "y.z"' +expanded: ':fail: unrouteable mail domain "y.z"' (tainted) file is not a filter file parse_forward_list: :fail: unrouteable mail domain "y.z" extract item: :fail: unrouteable mail domain "y.z" @@ -227,7 +227,7 @@ y.z in "test.ex : myhost.test.ex"? no (end of list) y.z in "! +local_domains"? yes (end of list) calling fail_remote_domains router rda_interpret (string): ':fail: unrouteable mail domain "$domain"' -expanded: ':fail: unrouteable mail domain "y.z"' +expanded: ':fail: unrouteable mail domain "y.z"' (tainted) file is not a filter file parse_forward_list: :fail: unrouteable mail domain "y.z" extract item: :fail: unrouteable mail domain "y.z" @@ -282,7 +282,7 @@ smart.domain in "test.ex : myhost.test.ex"? no (end of list) smart.domain in "! +local_domains"? yes (end of list) calling fail_remote_domains router rda_interpret (string): ':fail: unrouteable mail domain "$domain"' -expanded: ':fail: unrouteable mail domain "smart.domain"' +expanded: ':fail: unrouteable mail domain "smart.domain"' (tainted) file is not a filter file parse_forward_list: :fail: unrouteable mail domain "smart.domain" extract item: :fail: unrouteable mail domain "smart.domain" diff --git a/test/stderr/0297 b/test/stderr/0297 index 36bcfb480..f1a0a2e29 100644 --- a/test/stderr/0297 +++ b/test/stderr/0297 @@ -8,7 +8,7 @@ routing /a/b/c@myhost.test.ex --------> r1 router <-------- local_part=/a/b/c domain=myhost.test.ex calling r1 router -rda_interpret (string): '$local_part' +rda_interpret (string): '${bless:$local_part}' expanded: '/a/b/c' file is not a filter file parse_forward_list: /a/b/c @@ -32,7 +32,7 @@ routing /x/y/z@myhost.test.ex --------> r1 router <-------- local_part=/x/y/z domain=myhost.test.ex calling r1 router -rda_interpret (string): '$local_part' +rda_interpret (string): '${bless:$local_part}' expanded: '/x/y/z' file is not a filter file parse_forward_list: /x/y/z diff --git a/test/stderr/0361 b/test/stderr/0361 index cd96418fe..8f5ef0b2b 100644 --- a/test/stderr/0361 +++ b/test/stderr/0361 @@ -149,7 +149,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 diff --git a/test/stderr/0364 b/test/stderr/0364 index 1b08f726b..43462a56f 100644 --- a/test/stderr/0364 +++ b/test/stderr/0364 @@ -10,7 +10,7 @@ checking domains processing address_data calling r1 router rda_interpret (string): '$local_part@$domain.test.ex' -expanded: 'kilos@thishost.test.ex' +expanded: 'kilos@thishost.test.ex' (tainted) file is not a filter file parse_forward_list: kilos@thishost.test.ex extract item: kilos@thishost.test.ex @@ -55,7 +55,7 @@ checking domains processing address_data calling r1 router rda_interpret (string): '$local_part@$domain.test.ex' -expanded: 'solik@otherhost.test.ex' +expanded: 'solik@otherhost.test.ex' (tainted) file is not a filter file parse_forward_list: solik@otherhost.test.ex extract item: solik@otherhost.test.ex @@ -81,7 +81,7 @@ checking "condition" "${if eq{$address_data}{}{no}{yes}}"... processing address_data calling r3 router rda_interpret (string): '$local_part@$original_domain.sub.test.ex' -expanded: 'solik@otherhost.sub.test.ex' +expanded: 'solik@otherhost.sub.test.ex' (tainted) file is not a filter file parse_forward_list: solik@otherhost.sub.test.ex extract item: solik@otherhost.sub.test.ex @@ -110,7 +110,7 @@ local_part=solik domain=otherhost.sub.test.ex checking domains calling r4 router rda_interpret (string): ':fail:Can't route to $domain' -expanded: ':fail:Can't route to otherhost.sub.test.ex' +expanded: ':fail:Can't route to otherhost.sub.test.ex' (tainted) file is not a filter file parse_forward_list: :fail:Can't route to otherhost.sub.test.ex extract item: :fail:Can't route to otherhost.sub.test.ex @@ -123,7 +123,7 @@ checking domains processing address_data calling r1 router rda_interpret (string): '$local_part@$domain.test.ex' -expanded: 'xxx@ten-1.test.ex' +expanded: 'xxx@ten-1.test.ex' (tainted) file is not a filter file parse_forward_list: xxx@ten-1.test.ex extract item: xxx@ten-1.test.ex @@ -158,7 +158,7 @@ checking domains processing address_data calling r1 router rda_interpret (string): '$local_part@$domain.test.ex' -expanded: 'xxx@testsub.test.ex' +expanded: 'xxx@testsub.test.ex' (tainted) file is not a filter file parse_forward_list: xxx@testsub.test.ex extract item: xxx@testsub.test.ex @@ -184,7 +184,7 @@ checking "condition" "${if eq{$address_data}{}{no}{yes}}"... processing address_data calling r3 router rda_interpret (string): '$local_part@$original_domain.sub.test.ex' -expanded: 'xxx@testsub.sub.test.ex' +expanded: 'xxx@testsub.sub.test.ex' (tainted) file is not a filter file parse_forward_list: xxx@testsub.sub.test.ex extract item: xxx@testsub.sub.test.ex diff --git a/test/stderr/0377 b/test/stderr/0377 index 98f92e0a3..f395ee37a 100644 --- a/test/stderr/0377 +++ b/test/stderr/0377 @@ -55,7 +55,7 @@ local_part=cccc domain=myhost.test.ex checking local_parts calling cccc_redirect router rda_interpret (string): 'cccc@$domain, defer_cccc@$domain' -expanded: 'cccc@myhost.test.ex, defer_cccc@myhost.test.ex' +expanded: 'cccc@myhost.test.ex, defer_cccc@myhost.test.ex' (tainted) file is not a filter file parse_forward_list: cccc@myhost.test.ex, defer_cccc@myhost.test.ex extract item: cccc@myhost.test.ex @@ -89,7 +89,7 @@ checking local_parts checking "condition" "${if first_delivery{yes}{no}}"... calling bbbb router rda_interpret (string): 'bbbb@$domain, defer_bbbb@$domain' -expanded: 'bbbb@myhost.test.ex, defer_bbbb@myhost.test.ex' +expanded: 'bbbb@myhost.test.ex, defer_bbbb@myhost.test.ex' (tainted) file is not a filter file parse_forward_list: bbbb@myhost.test.ex, defer_bbbb@myhost.test.ex extract item: bbbb@myhost.test.ex @@ -115,7 +115,7 @@ checking local_parts checking "condition" "${if first_delivery{yes}{no}}"... calling unseen_aaaa router rda_interpret (string): 'defer_aaaa@$domain' -expanded: 'defer_aaaa@myhost.test.ex' +expanded: 'defer_aaaa@myhost.test.ex' (tainted) file is not a filter file parse_forward_list: defer_aaaa@myhost.test.ex extract item: defer_aaaa@myhost.test.ex @@ -357,7 +357,7 @@ checking local_parts checking "condition" "${if first_delivery{no}{yes}}"... calling cccc_2nd_time router rda_interpret (string): '$local_part@$domain' -expanded: 'cccc@myhost.test.ex' +expanded: 'cccc@myhost.test.ex' (tainted) file is not a filter file parse_forward_list: cccc@myhost.test.ex extract item: cccc@myhost.test.ex @@ -459,7 +459,7 @@ local_part=cccc domain=myhost.test.ex checking local_parts calling cccc_redirect router rda_interpret (string): 'cccc@$domain, defer_cccc@$domain' -expanded: 'cccc@myhost.test.ex, defer_cccc@myhost.test.ex' +expanded: 'cccc@myhost.test.ex, defer_cccc@myhost.test.ex' (tainted) file is not a filter file parse_forward_list: cccc@myhost.test.ex, defer_cccc@myhost.test.ex extract item: cccc@myhost.test.ex @@ -601,7 +601,7 @@ checking local_parts checking "condition" "${if first_delivery{no}{yes}}"... calling cccc_2nd_time router rda_interpret (string): '$local_part@$domain' -expanded: 'cccc@myhost.test.ex' +expanded: 'cccc@myhost.test.ex' (tainted) file is not a filter file parse_forward_list: cccc@myhost.test.ex extract item: cccc@myhost.test.ex @@ -703,7 +703,7 @@ local_part=cccc domain=myhost.test.ex checking local_parts calling cccc_redirect router rda_interpret (string): 'cccc@$domain, defer_cccc@$domain' -expanded: 'cccc@myhost.test.ex, defer_cccc@myhost.test.ex' +expanded: 'cccc@myhost.test.ex, defer_cccc@myhost.test.ex' (tainted) file is not a filter file parse_forward_list: cccc@myhost.test.ex, defer_cccc@myhost.test.ex extract item: cccc@myhost.test.ex diff --git a/test/stderr/0378 b/test/stderr/0378 index e48fb7e76..dec065131 100644 --- a/test/stderr/0378 +++ b/test/stderr/0378 @@ -40,7 +40,7 @@ deliver defer_aaaa@myhost.test.ex save TESTSUITE/test-mail/file pipe "/bin/sh -c exit" mail subject autoreply -text "This is an autoreply"' +text "This is an autoreply"' (tainted) data is an Exim filter program Filter: start of processing Filter: end of processing @@ -193,7 +193,7 @@ checking local_parts checking "condition" "${if first_delivery{no}{yes}}"... calling aaaa_2nd_time router rda_interpret (string): 'aaaa@$domain' -expanded: 'aaaa@myhost.test.ex' +expanded: 'aaaa@myhost.test.ex' (tainted) file is not a filter file parse_forward_list: aaaa@myhost.test.ex extract item: aaaa@myhost.test.ex @@ -230,7 +230,7 @@ deliver defer_aaaa@myhost.test.ex save TESTSUITE/test-mail/file pipe "/bin/sh -c exit" mail subject autoreply -text "This is an autoreply"' +text "This is an autoreply"' (tainted) data is an Exim filter program Filter: start of processing Filter: end of processing diff --git a/test/stderr/0379 b/test/stderr/0379 index 26a225fe2..7c0f0b9e0 100644 --- a/test/stderr/0379 +++ b/test/stderr/0379 @@ -30,7 +30,7 @@ local_part=aaaa domain=myhost.test.ex checking local_parts calling aaaa_redirect router rda_interpret (string): 'bbbb@$domain, cccc@$domain' -expanded: 'bbbb@myhost.test.ex, cccc@myhost.test.ex' +expanded: 'bbbb@myhost.test.ex, cccc@myhost.test.ex' (tainted) file is not a filter file parse_forward_list: bbbb@myhost.test.ex, cccc@myhost.test.ex extract item: bbbb@myhost.test.ex diff --git a/test/stderr/0380 b/test/stderr/0380 index c653fc309..b163d3f99 100644 --- a/test/stderr/0380 +++ b/test/stderr/0380 @@ -33,7 +33,7 @@ r1 router skipped: local_parts mismatch local_part=bbbb domain=myhost.test.ex checking local_parts calling r2 router -rda_interpret (file): 'TESTSUITE/non-exist/$local_part' +rda_interpret (file): 'TESTSUITE/non-exist/${bless:$local_part}' expanded: 'TESTSUITE/non-exist/bbbb' TESTSUITE/non-exist/bbbb does not exist ignore_enotdir set => skip checking parent directory @@ -61,7 +61,7 @@ forced failure in expansion of "${if eq {a}{b}{x}fail}" (address_data): decline local_part=aaaa domain=myhost.test.ex checking local_parts calling r1 router -rda_interpret (file): 'TESTSUITE/non-exist/$local_part' +rda_interpret (file): 'TESTSUITE/non-exist/${bless:$local_part}' expanded: 'TESTSUITE/non-exist/aaaa' TESTSUITE/non-exist/aaaa does not exist checking parent directory diff --git a/test/stderr/0464 b/test/stderr/0464 index 512ed1b58..86e8fe38d 100644 --- a/test/stderr/0464 +++ b/test/stderr/0464 @@ -50,7 +50,7 @@ cached lookup data = data for domain1 domain1 in "+special_domains"? yes (matched "+special_domains" - cached) calling r1 router rda_interpret (string): '$local_part@xxx.$domain' -expanded: 'abc@xxx.domain1' +expanded: 'abc@xxx.domain1' (tainted) file is not a filter file parse_forward_list: abc@xxx.domain1 extract item: abc@xxx.domain1 @@ -117,7 +117,7 @@ cached lookup data = data for domain1 domain1 in "+special_domains"? yes (matched "+special_domains" - cached) calling r1 router rda_interpret (string): '$local_part@xxx.$domain' -expanded: 'abc@xxx.domain1' +expanded: 'abc@xxx.domain1' (tainted) file is not a filter file parse_forward_list: abc@xxx.domain1 extract item: abc@xxx.domain1 diff --git a/test/stderr/0584 b/test/stderr/0584 new file mode 100644 index 000000000..af4f47118 --- /dev/null +++ b/test/stderr/0584 @@ -0,0 +1 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 == CALLER@the.local.host.name R=localuser T=local_delivery defer (-1): Tainted 'TESTSUITE/test-mail/CALLER' (file or directory name for local_delivery transport) not permitted |