Merge branch 'exim-4.96+security' into master+security

[exim.git] / test / stderr / 0305

diff --git a/test/stderr/0305 b/test/stderr/0305
index 7fc6cfc5be9fc1a5cc22fc44798d108822e90885..5da648d5074b4f2f99a046943e2f36f5a3cdae45 100644 (file)
--- a/test/stderr/0305
+++ b/test/stderr/0305
@@ -6,18 +6,29 @@
 >>> 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)
 >>> using ACL "acl1"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 18)
 >>> check domains = +ok_domains
->>> ten-1.test.ex in "ten-1.test.ex"? yes (matched "ten-1.test.ex")
->>> ten-1.test.ex in "+ok_domains"? yes (matched "+ok_domains")
+>>> ten-1.test.ex in "+ok_domains"?
+>>>  list element: +ok_domains
+>>>  ten-1.test.ex in "ten-1.test.ex"?
+>>>   list element: ten-1.test.ex
+>>>   ten-1.test.ex in "ten-1.test.ex"? yes (matched "ten-1.test.ex")
+>>>  ten-1.test.ex in "+ok_domains"? yes (matched "+ok_domains")
 >>> accept: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": ACCEPT
 >>> using ACL "acl1"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 18)
 >>> check domains = +ok_domains
->>> junk.junk in ""? no (end of list)
+>>> junk.junk in "+ok_domains"?
+>>>  list element: +ok_domains
+>>>  junk.junk in ""?
+>>>  junk.junk in ""? no (end of list)
 >>> junk.junk in "+ok_domains"? no (end of list)
 >>> accept: condition test failed in ACL "acl1"
 >>> end of ACL "acl1": implicit DENY
-LOG: H=[V4NET.2.3.4] F=<x@y> rejected RCPT <x@junk.junk>
+LOG: H=(test) [V4NET.2.3.4] F=<x@y> rejected RCPT <x@junk.junk>