Fix mismerge

[exim.git] / test / stderr / 0445

diff --git a/test/stderr/0445 b/test/stderr/0445
index 38410b78e54d223dd78285f5876fa9e228d990f4..2a0e6f764cf574fdcd15273b090636050317a1e8 100644 (file)
--- a/test/stderr/0445
+++ b/test/stderr/0445
@@ -6,9 +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" (TESTSUITE/test-config 20)
+>>> processing ACL rcpt "deny" (TESTSUITE/test-config 20)
 >>> check !verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing lp1@x.y
@@ -16,12 +19,12 @@
 >>> calling bad_addresses router
 >>> bad_addresses router forced address failure
 >>> ----------- end verify ------------
->>> deny: condition test succeeded in ACL "rcpt"
->>> end of ACL "rcpt": DENY
+>>> deny: condition test succeeded in ACL rcpt
+>>> 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" (TESTSUITE/test-config 20)
+>>> processing ACL rcpt "deny" (TESTSUITE/test-config 20)
 >>> check !verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing lp2@x.y
@@ -29,7 +32,7 @@ LOG: H=(test) [1.2.3.4] F=<lp1@x.y> rejected RCPT <zz@x.y>: Sender verify failed
 >>> calling bad_addresses router
 >>> bad_addresses router forced address failure
 >>> ----------- end verify ------------
->>> deny: condition test succeeded in ACL "rcpt"
->>> end of ACL "rcpt": DENY
+>>> deny: condition test succeeded in ACL rcpt
+>>> 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