X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/54c5ebb14ead7439af300e9d7d9d7d2ba29ff32e..6808e0f19ec9a9544241e26cf1e3179eb86bbd00:/test/stderr/0138?ds=sidebyside

diff --git a/test/stderr/0138 b/test/stderr/0138
index 44b0eba19..6099e773a 100644
--- a/test/stderr/0138
+++ b/test/stderr/0138
@@ -7,39 +7,44 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> exim.test.ex in helo_lookup_domains? no (end of list)
+>>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 17)
 >>> check hosts = :
 >>> host in ":"? no (end of list)
->>> accept: condition test failed
->>> processing "accept"
+>>> accept: condition test failed in ACL "check_recipient"
+>>> processing "accept" (TESTSUITE/test-config 18)
 >>> check recipients = postmaster@exim.test.ex
 >>> userx@exim.test.ex in "postmaster@exim.test.ex"? no (end of list)
->>> accept: condition test failed
->>> processing "accept"
+>>> accept: condition test failed in ACL "check_recipient"
+>>> processing "accept" (TESTSUITE/test-config 19)
 >>> check dnslists = rbl3.test.ex
->>> DNS list check: rbl3.test.ex
+>>> dnslists check: rbl3.test.ex
 >>> new DNS lookup for 14.12.11.V4NET.rbl3.test.ex
+>>> dnslists: wrote cache entry, ttl=3600
 >>> DNS lookup for 14.12.11.V4NET.rbl3.test.ex succeeded (yielding 127.0.0.2)
 >>> => that means V4NET.11.12.14 is listed at rbl3.test.ex
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 17)
 >>> check hosts = :
 >>> host in ":"? no (end of list)
->>> accept: condition test failed
->>> processing "accept"
+>>> accept: condition test failed in ACL "check_recipient"
+>>> processing "accept" (TESTSUITE/test-config 18)
 >>> check recipients = postmaster@exim.test.ex
 >>> list@exim.test.ex in "postmaster@exim.test.ex"? no (end of list)
->>> accept: condition test failed
->>> processing "accept"
+>>> accept: condition test failed in ACL "check_recipient"
+>>> processing "accept" (TESTSUITE/test-config 19)
 >>> check dnslists = rbl3.test.ex
->>> DNS list check: rbl3.test.ex
->>> using result of previous DNS lookup
+>>> dnslists check: rbl3.test.ex
+>>> dnslists: using result of previous lookup
 >>> DNS lookup for 14.12.11.V4NET.rbl3.test.ex succeeded (yielding 127.0.0.2)
 >>> => that means V4NET.11.12.14 is listed at rbl3.test.ex
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.14] P=esmtp S=sss
 >>> host in hosts_connection_nolog? no (option unset)
@@ -51,38 +56,45 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> exim.test.ex in helo_lookup_domains? no (end of list)
+>>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 17)
 >>> check hosts = :
 >>> host in ":"? no (end of list)
->>> accept: condition test failed
->>> processing "accept"
+>>> accept: condition test failed in ACL "check_recipient"
+>>> processing "accept" (TESTSUITE/test-config 18)
 >>> check recipients = postmaster@exim.test.ex
 >>> userx@exim.test.ex in "postmaster@exim.test.ex"? no (end of list)
->>> accept: condition test failed
->>> processing "accept"
+>>> accept: condition test failed in ACL "check_recipient"
+>>> processing "accept" (TESTSUITE/test-config 19)
 >>> check dnslists = rbl3.test.ex
->>> DNS list check: rbl3.test.ex
+>>> dnslists check: rbl3.test.ex
 >>> new DNS lookup for 13.12.11.V4NET.rbl3.test.ex
+>>> dnslists: wrote cache entry, ttl=3000
 >>> DNS lookup for 13.12.11.V4NET.rbl3.test.ex failed
 >>> => that means V4NET.11.12.13 is not listed at rbl3.test.ex
->>> accept: condition test failed
->>> processing "deny"
+>>> accept: condition test failed in ACL "check_recipient"
+>>> processing "deny" (TESTSUITE/test-config 20)
+>>>   message: host is listed in $dnslist_domain
 >>> check dnslists = rbl2.test.ex
->>> DNS list check: rbl2.test.ex
+>>> dnslists check: rbl2.test.ex
 >>> new DNS lookup for 13.12.11.V4NET.rbl2.test.ex
+>>> dnslists: wrote cache entry, ttl=3000
 >>> DNS lookup for 13.12.11.V4NET.rbl2.test.ex failed
 >>> => that means V4NET.11.12.13 is not listed at rbl2.test.ex
->>> deny: condition test failed
->>> processing "warn"
+>>> deny: condition test failed in ACL "check_recipient"
+>>> processing "warn" (TESTSUITE/test-config 22)
+>>>   message: X-Warning: $sender_host_address is listed at $dnslist_domain
 >>> check dnslists = rbl.test.ex
->>> DNS list check: rbl.test.ex
+>>> dnslists check: rbl.test.ex
 >>> new DNS lookup for 13.12.11.V4NET.rbl.test.ex
+>>> dnslists: wrote cache entry, ttl=3
 >>> DNS lookup for 13.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
 >>> => that means V4NET.11.12.13 is listed at rbl.test.ex
->>> warn: condition test succeeded
->>> processing "require"
+>>> warn: condition test succeeded in ACL "check_recipient"
+>>> processing "require" (TESTSUITE/test-config 24)
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing postmaster@exim.test.ex
@@ -96,8 +108,9 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1
 >>> calling localuser router
 >>> routed by localuser router
 >>> ----------- end verify ------------
->>> require: condition test succeeded
->>> processing "deny"
+>>> require: condition test succeeded in ACL "check_recipient"
+>>> processing "deny" (TESTSUITE/test-config 25)
+>>>   message: unrouteable address
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@exim.test.ex
@@ -107,11 +120,12 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1
 >>> calling localuser router
 >>> routed by localuser router
 >>> ----------- end verify ------------
->>> deny: condition test failed
->>> processing "accept"
+>>> deny: condition test failed in ACL "check_recipient"
+>>> processing "accept" (TESTSUITE/test-config 27)
 >>> check domains = +local_domains
 >>> exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
 >>> exim.test.ex in "+local_domains"? yes (matched "+local_domains")
->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 LOG: 10HmaY-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.13] P=esmtp S=sss