Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0384

diff --git a/test/stderr/0384 b/test/stderr/0384
index 1906cbd2d21079bbb2b72f71ef227f3cc8bd651d..747d2bdc620a572eac801cb24c0be2d89142a199 100644 (file)
--- a/test/stderr/0384
+++ b/test/stderr/0384
@@ -3,18 +3,33 @@
 >>> host in host_reject_connection? no (option unset)
 >>> host in sender_unqualified_hosts? no (option unset)
 >>> host in recipient_unqualified_hosts? no (option unset)
->>> host in helo_verify_hosts? yes (matched "*")
+>>> host in helo_verify_hosts?
+>>>  list element: *
+>>>  host in helo_verify_hosts? yes (matched "*")
 >>> host in helo_accept_junk_hosts? no (option unset)
+>>> [V4NET.9.8.7] in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> [V4NET.9.8.7] in helo_lookup_domains? no (end of list)
 >>> verifying EHLO/HELO argument "[V4NET.9.8.7]"
 >>> matched host address
+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")
 >>> host in dsn_advertise_hosts? no (option unset)
->>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
->>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> [1.2.3.4] in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> [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"
+>>> processing "accept" (TESTSUITE/test-config 13)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT