Docs: list $spam_ variables in expansions chapter

[users/heiko/exim.git] / test / stderr / 3202

diff --git a/test/stderr/3202 b/test/stderr/3202
index 665b40191c6169807916ebf419225f2f58818498..557a0da043df2c62700bb34de714387adc03175a 100644 (file)
--- a/test/stderr/3202
+++ b/test/stderr/3202
@@ -7,10 +7,10 @@
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_1_1_1"
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_1_1_1"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 17)

 >>> check hosts = net-testdb;defer
 >>> host in "net-testdb;defer"? list match deferred for net-testdb;defer
 >>> check hosts = net-testdb;defer
 >>> host in "net-testdb;defer"? list match deferred for net-testdb;defer

->>> accept: condition test deferred
+>>> accept: condition test deferred in ACL "acl_1_1_1"

 LOG: H=[1.1.1.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 LOG: H=[1.1.1.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)


@@ -21,10 +21,10 @@ LOG: H=[1.1.1.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced D
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_1_1_2"
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_1_1_2"

->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 20)

 >>> check domains = testdb;defer
 >>> y in "testdb;defer"? list match deferred for testdb;defer
 >>> check domains = testdb;defer
 >>> y in "testdb;defer"? list match deferred for testdb;defer

->>> deny: condition test deferred
+>>> deny: condition test deferred in ACL "acl_1_1_2"

 LOG: H=[1.1.2.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 LOG: H=[1.1.2.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)


@@ -35,8 +35,8 @@ LOG: H=[1.1.2.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced D
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_1_1_3"
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "acl_1_1_3"

->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 23)

 >>> check local_parts = testdb;defer
 >>> x in "testdb;defer"? list match deferred for testdb;defer
 >>> check local_parts = testdb;defer
 >>> x in "testdb;defer"? list match deferred for testdb;defer

->>> require: condition test deferred
+>>> require: condition test deferred in ACL "acl_1_1_3"

 LOG: H=[1.1.3.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
 LOG: H=[1.1.3.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER