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

[exim.git] / test / stderr / 0130

diff --git a/test/stderr/0130 b/test/stderr/0130
index 50c29e9384d366ed9ae8660c87fe97fb9fa1015f..5dbcd3e4beccfbb100c610608d87908b37ed287b 100644 (file)
--- a/test/stderr/0130
+++ b/test/stderr/0130
@@ -6,26 +6,36 @@
 >>> 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)
 >>> 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"
 >>> using ACL "check_recipient"

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

 >>>   message: unrouteable address
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@not.test.ex
 >>>   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"?
+>>>  list element: ! +local_domains
+>>>  not.test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>  not.test.ex in "test.ex"? no (end of list)

 >>> not.test.ex in "! +local_domains"? yes (end of list)
 >>> calling islocal router
 >>> not.test.ex in "! +local_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
 >>> 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 in ACL "check_recipient"
 >>> islocal router: defer for userx@not.test.ex
 >>>   message: remote host address is the local host
 >>> ----------- end verify ------------
 >>> deny: condition test deferred in ACL "check_recipient"

-LOG: H=[V4NET.0.0.0] F=<userx@test.ex> temporarily rejected RCPT <userx@not.test.ex>: remote host address is the local host
+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>)
 LOG: MAIN
   remote host address is the local host: not.test.ex (while routing <userx@not.test.ex>)