Testsuite: output changes resulting

[exim.git] / test / stderr / 0057

diff --git a/test/stderr/0057 b/test/stderr/0057
index 2f087d7c1b4affa15533a5fdbaed7377fcafbc94..341a5dbdf1a0ae568648fc31f67c1e614fb39784 100644 (file)
--- a/test/stderr/0057
+++ b/test/stderr/0057
@@ -6,46 +6,94 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
+>>> test in helo_lookup_domains? no (end of list)
+>>> test.ex in percent_hack_domains?
+>>>  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: *.test.ex
 >>> test.ex in percent_hack_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains
->>> test.ex in "test.ex : myhost.ex : *.test.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+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")
+>>>  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: !b.test.ex
+>>>  list element: !TESTSUITE/aux-fixed/0057.d1
+>>>  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"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains
->>> anotherhost.example.com in "test.ex : myhost.ex : *.test.ex"? no (end of list)
+>>> 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)
 >>> 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 "test.ex : !*"? no (matched "!*")
+>>> 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 "!*")
 >>> anotherhost.example.com in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 25)
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
-LOG: H=[V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
+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: !b.test.ex
+>>>  list element: !TESTSUITE/aux-fixed/0057.d1
+>>>  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"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains
->>> 3rdhost.example.com in "test.ex : myhost.ex : *.test.ex"? no (end of list)
+>>> 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)
 >>> 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 "test.ex : !*"? no (matched "!*")
+>>> 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 "!*")
 >>> 3rdhost.example.com in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 25)
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
-LOG: H=[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=[V4NET.0.0.1] P=smtp S=sss
+LOG: H=(test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@3rdhost.example.com>: relay not permitted
+LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss