Imported Bug 1057 multiple clamd patch from PLD repo

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

diff --git a/test/stderr/0042 b/test/stderr/0042
index 2c4cc1dc86b710af223c446c3099638ba12605c9..e3ee2b7a36d82a56dc1ba2eb3129a989049b34a1 100644 (file)
--- a/test/stderr/0042
+++ b/test/stderr/0042
@@ -8,20 +8,32 @@
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> processing "accept"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> processing "accept"

->>> accept: condition test succeeded
+>>> accept: condition test succeeded in inline ACL

 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.ex
 >>> test.ex in "test.ex"? yes (matched "test.ex")
 >>> test.ex in "! +local_domains"? no (matched "! +local_domains")
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.ex
 >>> test.ex in "test.ex"? yes (matched "test.ex")
 >>> test.ex in "! +local_domains"? no (matched "! +local_domains")

+>>> userx in "expan"? no (end of list)

 >>> userx in "userx"? yes (matched "userx")
 >>> calling localuser router
 >>> routed by localuser router
 >>> processing "accept"
 >>> userx in "userx"? yes (matched "userx")
 >>> calling localuser router
 >>> routed by localuser router
 >>> processing "accept"

->>> accept: condition test succeeded
+>>> accept: condition test succeeded in inline ACL

 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing junkjunk@test.ex
 >>> test.ex in "test.ex"? yes (matched "test.ex")
 >>> test.ex in "! +local_domains"? no (matched "! +local_domains")
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing junkjunk@test.ex
 >>> test.ex in "test.ex"? yes (matched "test.ex")
 >>> test.ex in "! +local_domains"? no (matched "! +local_domains")

+>>> junkjunk in "expan"? no (end of list)

 >>> junkjunk in "userx"? no (end of list)
 >>> no more routers
 LOG: VRFY failed for junkjunk@test.ex H=[1.1.1.1]
 >>> junkjunk in "userx"? no (end of list)
 >>> no more routers
 LOG: VRFY failed for junkjunk@test.ex H=[1.1.1.1]

+>>> processing "accept"
+>>> accept: condition test succeeded in inline ACL
+>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+>>> routing expan@test.ex
+>>> test.ex in "test.ex"? yes (matched "test.ex")
+>>> test.ex in "! +local_domains"? no (matched "! +local_domains")
+>>> expan in "expan"? yes (matched "expan")
+>>> calling fail_expansion router
+>>> fail_expansion router: defer for expan@test.ex
+>>>   message: failed to expand "${if with syntax error": unknown condition "with"