Make smtp_receive_timeout main option expanded. Bug 564

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

diff --git a/test/stderr/3202 b/test/stderr/3202
index 795623325ad2d2a7f4893f2eba9440de544944ef..be32ca79b0414e567dc6f1322f92518e51f94c8e 100644 (file)
--- a/test/stderr/3202
+++ b/test/stderr/3202
@@ -9,8 +9,8 @@
 >>> using ACL "acl_1_1_1"
 >>> processing "accept"
 >>> check hosts = net-testdb;defer
->>> host in "net-testdb;defer"? lookup deferred for net-testdb;defer
->>> accept: condition test deferred
+>>> host in "net-testdb;defer"? list match deferred for net-testdb;defer
+>>> 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)
@@ -23,8 +23,8 @@ LOG: H=[1.1.1.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced D
 >>> using ACL "acl_1_1_2"
 >>> processing "deny"
 >>> check domains = testdb;defer
->>> y in "testdb;defer"? lookup deferred for testdb;defer
->>> deny: condition test deferred
+>>> y in "testdb;defer"? list match deferred for testdb;defer
+>>> 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)
@@ -37,6 +37,6 @@ LOG: H=[1.1.2.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced D
 >>> using ACL "acl_1_1_3"
 >>> processing "require"
 >>> check local_parts = testdb;defer
->>> x in "testdb;defer"? lookup deferred for testdb;defer
->>> require: condition test deferred
+>>> x in "testdb;defer"? list match deferred for testdb;defer
+>>> 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