Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0587

diff --git a/test/stderr/0587 b/test/stderr/0587
index 54d98df1bbdeb6de906f4b3ac9360a3cf6d8c54b..3f9d2b5d6a9ea2c68a46e5417a21dba7fe0486d7 100644 (file)
--- a/test/stderr/0587
+++ b/test/stderr/0587
@@ -6,16 +6,17 @@
 >>> 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)

->>> list element: 
->>> list element: @
->>> list element: @[]
+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]

 >>> test in helo_lookup_domains? no (end of list)
 >>> processing "accept" (TESTSUITE/test-config 14)
 >>> check hosts = test.again.dns
 >>> test in helo_lookup_domains? no (end of list)
 >>> processing "accept" (TESTSUITE/test-config 14)
 >>> check hosts = test.again.dns

->>> list element: test.again.dns
->>> test.again.dns in dns_again_means_nonexist? no (option unset)
+>>> host in "test.again.dns"?
+>>>  list element: test.again.dns
+>>>  test.again.dns in dns_again_means_nonexist? no (option unset)

 >>> no IP address found for host test.again.dns (during SMTP connection from (test) [ip4.ip4.ip4.ip4])
 >>> no IP address found for host test.again.dns (during SMTP connection from (test) [ip4.ip4.ip4.ip4])

->>> test.again.dns in dns_again_means_nonexist? no (option unset)
+>>>  test.again.dns in dns_again_means_nonexist? no (option unset)

 >>> host in "test.again.dns"? list match deferred for test.again.dns
 >>> accept: condition test deferred in inline ACL
 LOG: H=(test) [ip4.ip4.ip4.ip4] F=<ralph@dustyshoes.tld> temporarily rejected RCPT <bob@anotherone.tld>: DNS lookup of "test.again.dns" deferred
 >>> host in "test.again.dns"? list match deferred for test.again.dns
 >>> accept: condition test deferred in inline ACL
 LOG: H=(test) [ip4.ip4.ip4.ip4] F=<ralph@dustyshoes.tld> temporarily rejected RCPT <bob@anotherone.tld>: DNS lookup of "test.again.dns" deferred