Lookups: dsearch subdir with leading "..". Bug 2994

[exim.git] / test / stderr / 0057

diff --git a/test/stderr/0057 b/test/stderr/0057
index 902d8207e42630296899a309c6910f04d994cd1f..693ccfdd1057748fc3238140c7ff8c3e78cc8898 100644 (file)
--- a/test/stderr/0057
+++ b/test/stderr/0057
@@ -11,10 +11,10 @@
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> test.ex in percent_hack_domains?
->>>  list element: ! a.test.ex
+>>>  list element: !░a.test.ex
 >>>  list element: !b.test.ex
 >>>  list element: !TESTSUITE/aux-fixed/0057.d1
->>>  list element: ! TESTSUITE/aux-fixed/0057.d2
+>>>  list element: !░TESTSUITE/aux-fixed/0057.d2
 >>>  list element: *.test.ex
 >>> test.ex in percent_hack_domains? no (end of list)
 >>> using ACL "check_recipient"
@@ -22,17 +22,20 @@
 >>> check domains = +local_domains
 >>> test.ex in "+local_domains"?
 >>>  list element: +local_domains
->>>  test.ex in "test.ex : myhost.ex : *.test.ex"?
->>>   list element: test.ex
->>>   test.ex in "test.ex : myhost.ex : *.test.ex"? yes (matched "test.ex")
+>>>   start sublist local_domains
+>>>    test.ex in "test.ex : myhost.ex : *.test.ex"?
+>>>    ╎list element: test.ex
+>>>    ╎test.ex in "test.ex : myhost.ex : *.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 "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> anotherhost.example.com in percent_hack_domains?
->>>  list element: ! a.test.ex
+>>>  list element: !░a.test.ex
 >>>  list element: !b.test.ex
 >>>  list element: !TESTSUITE/aux-fixed/0057.d1
->>>  list element: ! TESTSUITE/aux-fixed/0057.d2
+>>>  list element: !░TESTSUITE/aux-fixed/0057.d2
 >>>  list element: *.test.ex
 >>> anotherhost.example.com in percent_hack_domains? no (end of list)
 >>> using ACL "check_recipient"
@@ -40,21 +43,26 @@
 >>> check domains = +local_domains
 >>> anotherhost.example.com in "+local_domains"?
 >>>  list element: +local_domains
->>>  anotherhost.example.com in "test.ex : myhost.ex : *.test.ex"?
->>>   list element: test.ex
->>>   list element: myhost.ex
->>>   list element: *.test.ex
->>>  anotherhost.example.com in "test.ex : myhost.ex : *.test.ex"? no (end of list)
+>>>   start sublist local_domains
+>>>    anotherhost.example.com in "test.ex : myhost.ex : *.test.ex"?
+>>>    ╎list element: test.ex
+>>>    ╎list element: myhost.ex
+>>>    ╎list element: *.test.ex
+>>>    anotherhost.example.com in "test.ex : myhost.ex : *.test.ex"? no (end of list)
+>>>   end sublist local_domains
 >>> anotherhost.example.com in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check domains = +relay_domains
 >>> anotherhost.example.com in "+relay_domains"?
 >>>  list element: +relay_domains
->>>  anotherhost.example.com in "test.ex : !*"?
->>>   list element: test.ex
->>>   list element: !*
->>>   anotherhost.example.com in "test.ex : !*"? no (matched "!*")
+>>>   start sublist relay_domains
+>>>    anotherhost.example.com in "test.ex : !*"?
+>>>    ╎list element: test.ex
+>>>    ╎list element: !*
+>>>    ╎anotherhost.example.com in "test.ex : !*"? no (matched "!*")
+>>>   end sublist relay_domains
+>>>  data from lookup saved for cache for +relay_domains: key 'anotherhost.example.com' value '*'
 >>> anotherhost.example.com in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 25)
@@ -63,10 +71,10 @@
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
 >>> 3rdhost.example.com in percent_hack_domains?
->>>  list element: ! a.test.ex
+>>>  list element: !░a.test.ex
 >>>  list element: !b.test.ex
 >>>  list element: !TESTSUITE/aux-fixed/0057.d1
->>>  list element: ! TESTSUITE/aux-fixed/0057.d2
+>>>  list element: !░TESTSUITE/aux-fixed/0057.d2
 >>>  list element: *.test.ex
 >>> 3rdhost.example.com in percent_hack_domains? no (end of list)
 >>> using ACL "check_recipient"
@@ -74,21 +82,26 @@ LOG: H=(test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@
 >>> check domains = +local_domains
 >>> 3rdhost.example.com in "+local_domains"?
 >>>  list element: +local_domains
->>>  3rdhost.example.com in "test.ex : myhost.ex : *.test.ex"?
->>>   list element: test.ex
->>>   list element: myhost.ex
->>>   list element: *.test.ex
->>>  3rdhost.example.com in "test.ex : myhost.ex : *.test.ex"? no (end of list)
+>>>   start sublist local_domains
+>>>    3rdhost.example.com in "test.ex : myhost.ex : *.test.ex"?
+>>>    ╎list element: test.ex
+>>>    ╎list element: myhost.ex
+>>>    ╎list element: *.test.ex
+>>>    3rdhost.example.com in "test.ex : myhost.ex : *.test.ex"? no (end of list)
+>>>   end sublist local_domains
 >>> 3rdhost.example.com in "+local_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check domains = +relay_domains
 >>> 3rdhost.example.com in "+relay_domains"?
 >>>  list element: +relay_domains
->>>  3rdhost.example.com in "test.ex : !*"?
->>>   list element: test.ex
->>>   list element: !*
->>>   3rdhost.example.com in "test.ex : !*"? no (matched "!*")
+>>>   start sublist relay_domains
+>>>    3rdhost.example.com in "test.ex : !*"?
+>>>    ╎list element: test.ex
+>>>    ╎list element: !*
+>>>    ╎3rdhost.example.com in "test.ex : !*"? no (matched "!*")
+>>>   end sublist relay_domains
+>>>  data from lookup saved for cache for +relay_domains: key '3rdhost.example.com' value '*'
 >>> 3rdhost.example.com in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 25)
@@ -96,4 +109,4 @@ LOG: H=(test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 LOG: H=(test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@3rdhost.example.com>: relay not permitted
-LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss
+LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss