Merge from master into 4.next

[users/jgh/exim.git] / test / stderr / 0384

diff --git a/test/stderr/0384 b/test/stderr/0384
index 849bbd9b8e96cd26fd37ce60d4c0217d27bff430..1906cbd2d21079bbb2b72f71ef227f3cc8bd651d 100644 (file)
--- a/test/stderr/0384
+++ b/test/stderr/0384
@@ -8,10 +8,13 @@
 >>> [V4NET.9.8.7] in helo_lookup_domains? no (end of list)
 >>> verifying EHLO/HELO argument "[V4NET.9.8.7]"
 >>> matched host address
 >>> [V4NET.9.8.7] in helo_lookup_domains? no (end of list)
 >>> verifying EHLO/HELO argument "[V4NET.9.8.7]"
 >>> matched host address

+>>> host in dsn_advertise_hosts? no (option unset)

 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in pipelining_advertise_hosts? yes (matched "*")

+>>> host in chunking_advertise_hosts? no (end of list)

 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> [1.2.3.4] in helo_lookup_domains? no (end of list)
 >>> verifying EHLO/HELO argument "[1.2.3.4]"
 LOG: rejected "EHLO [1.2.3.4]" from ([1.2.3.4]) [V4NET.9.8.7]
 >>> processing "accept"
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> [1.2.3.4] in helo_lookup_domains? no (end of list)
 >>> verifying EHLO/HELO argument "[1.2.3.4]"
 LOG: rejected "EHLO [1.2.3.4]" from ([1.2.3.4]) [V4NET.9.8.7]
 >>> processing "accept"

->>> accept: condition test succeeded
+>>> accept: condition test succeeded in inline ACL
+>>> end of inline ACL: ACCEPT