Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0445

diff --git a/test/stderr/0445 b/test/stderr/0445
index f8b5c1d87a24c49ea823855e97efa1a315671d26..9a272700a69553ecbf0ecd74890865e4ccb02b95 100644 (file)
--- a/test/stderr/0445
+++ b/test/stderr/0445
@@ -6,8 +6,12 @@
 >>> 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 "rcpt"
->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 20)
 >>> check !verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing lp1@x.y
@@ -16,10 +20,11 @@
 >>> bad_addresses router forced address failure
 >>> ----------- end verify ------------
 >>> deny: condition test succeeded in ACL "rcpt"
-LOG: H=[1.2.3.4] sender verify fail for <lp1@x.y>: 
-LOG: H=[1.2.3.4] F=<lp1@x.y> rejected RCPT <zz@x.y>: Sender verify failed
+>>> end of ACL "rcpt": DENY
+LOG: H=(test) [1.2.3.4] sender verify fail for <lp1@x.y>: 
+LOG: H=(test) [1.2.3.4] F=<lp1@x.y> rejected RCPT <zz@x.y>: Sender verify failed
 >>> using ACL "rcpt"
->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 20)
 >>> check !verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing lp2@x.y
@@ -28,5 +33,6 @@ LOG: H=[1.2.3.4] F=<lp1@x.y> rejected RCPT <zz@x.y>: Sender verify failed
 >>> bad_addresses router forced address failure
 >>> ----------- end verify ------------
 >>> deny: condition test succeeded in ACL "rcpt"
-LOG: H=[1.2.3.4] sender verify fail for <lp2@x.y>: This is a message
-LOG: H=[1.2.3.4] F=<lp2@x.y> rejected RCPT <zz@x.y>: Sender verify failed
+>>> end of ACL "rcpt": DENY
+LOG: H=(test) [1.2.3.4] sender verify fail for <lp2@x.y>: This is a message
+LOG: H=(test) [1.2.3.4] F=<lp2@x.y> rejected RCPT <zz@x.y>: Sender verify failed