Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0130

diff --git a/test/stderr/0130 b/test/stderr/0130
index c643eb4b984c3bcb858c8e3cd10dcd358fddd2dc..afd439edd44bce62ed2fa17290041f4f93387c33 100644 (file)
--- a/test/stderr/0130
+++ b/test/stderr/0130
@@ -6,25 +6,38 @@
 >>> 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 "check_recipient"
->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 21)
+>>>   message: unrouteable address
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@not.test.ex
->>> not.test.ex in "test.ex"? no (end of list)
->>> not.test.ex in "! +local_domains"? yes (end of list)
+>>> not.test.ex in domains?
+>>>  list element: !░+local_domains
+>>>   start sublist local_domains
+>>>    not.test.ex in "test.ex"?
+>>>    ╎list element: test.ex
+>>>    not.test.ex in "test.ex"? no (end of list)
+>>>   end sublist local_domains
+>>> not.test.ex in domains? yes (end of list)
 >>> calling islocal router
->>> not.test.ex in "*"? yes (matched "*")
+>>> not.test.ex in "*"?
+>>>  list element: *
+>>>  not.test.ex in "*"? yes (matched "*")
 >>> local host found for non-MX address
 >>> fully qualified name = localhost
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=localhost address=127.0.0.1
-LOG: remote host address is the local host: not.test.ex (while verifying <userx@not.test.ex> from host [V4NET.0.0.0])
+LOG: remote host address is the local host: not.test.ex (while verifying <userx@not.test.ex> from host (test) [V4NET.0.0.0])
 >>> islocal router: defer for userx@not.test.ex
 >>>   message: remote host address is the local host
 >>> ----------- end verify ------------
->>> deny: condition test deferred
-LOG: H=[V4NET.0.0.0] F=<userx@test.ex> temporarily rejected RCPT <userx@not.test.ex>: remote host address is the local host
+>>> deny: condition test deferred in ACL "check_recipient"
+LOG: H=(test) [V4NET.0.0.0] F=<userx@test.ex> temporarily rejected RCPT <userx@not.test.ex>: remote host address is the local host
 LOG: MAIN
   remote host address is the local host: not.test.ex (while routing <userx@not.test.ex>)