Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0034

diff --git a/test/stderr/0034 b/test/stderr/0034
index 8e8b068ddb43b8b8b2bbfd57dc79bb8bed68f65a..1dca5fcd8dc5a2790a3f5f68dc5d3ab56e46899c 100644 (file)
--- a/test/stderr/0034
+++ b/test/stderr/0034
@@ -6,6 +6,8 @@
 >>> 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)

+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: !10.0.0.1

 >>> host in smtp_accept_max_nonmail_hosts? yes (end of list)
 LOG: SMTP call from [10.0.0.2] dropped: too many nonmail commands (last was "rset")
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in smtp_accept_max_nonmail_hosts? yes (end of list)
 LOG: SMTP call from [10.0.0.2] dropped: too many nonmail commands (last was "rset")
 >>> host in hosts_connection_nolog? no (option unset)


@@ -16,4 +18,6 @@ LOG: SMTP call from [10.0.0.2] dropped: too many nonmail commands (last was "rse
 >>> 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)

->>> host in smtp_accept_max_nonmail_hosts? no (matched "!10.0.0.1")
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: !10.0.0.1
+>>>  host in smtp_accept_max_nonmail_hosts? no (matched "!10.0.0.1")