Unbreak build with dmarc, pt. 2

[exim.git] / test / stderr / 0069

diff --git a/test/stderr/0069 b/test/stderr/0069
index 619c7f17122400806d274cef69ceeae698994529..f8b08119387754418adb45636b0c801e14f8cb7e 100644 (file)
--- a/test/stderr/0069
+++ b/test/stderr/0069
@@ -21,7 +21,7 @@
 >>> host in "+include_unknown : ^ten-1\.test\.ex"? yes (matched "^ten-1\.test\.ex")
 >>> deny: condition test succeeded in ACL "check_recipientx"
 >>> end of ACL "check_recipientx": DENY
-LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<x@y> rejected RCPT <x@test.ex>
+LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<x@y> rejected RCPT <x@test.ex>
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -34,6 +34,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> 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? no (end of list)
 >>> using ACL "check_recipientx"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check hosts = :
@@ -46,7 +47,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> deny: condition test succeeded in ACL "check_recipientx"
 >>> end of ACL "check_recipientx": DENY
-LOG: H=[V4NET.0.0.13] F=<userx@myhost.test.ex> rejected RCPT <x@test.ex>
+LOG: H=(test) [V4NET.0.0.13] F=<userx@myhost.test.ex> rejected RCPT <x@test.ex>
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -59,18 +60,19 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> 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? no (end of list)
 >>> using ACL "check_recipienty"
 >>> processing "accept" (TESTSUITE/test-config 30)
 >>> check hosts = not-exist.test.ex : V4NET.0.0.13
->>> no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13])
-LOG: no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13])
+>>> no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
+LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
 >>> host in "not-exist.test.ex : V4NET.0.0.13"? no (failed to find IP address for not-exist.test.ex)
 >>> accept: condition test failed in ACL "check_recipienty"
 >>> processing "deny" (TESTSUITE/test-config 31)
 >>>   message: "Denied"
 >>> deny: condition test succeeded in ACL "check_recipienty"
 >>> end of ACL "check_recipienty": DENY
-LOG: H=[V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denied"
+LOG: H=(test) [V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denied"
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -83,11 +85,12 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> 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? no (end of list)
 >>> using ACL "check_recipientz"
 >>> processing "accept" (TESTSUITE/test-config 34)
 >>> check hosts = +ignore_unknown : not-exist.test.ex : V4NET.0.0.13
->>> no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13])
-LOG: no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13])
+>>> no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
+LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
 >>> failed to find IP address for not-exist.test.ex: item ignored by +ignore_unknown
 >>> host in "+ignore_unknown : not-exist.test.ex : V4NET.0.0.13"? yes (matched "V4NET.0.0.13")
 >>> accept: condition test succeeded in ACL "check_recipientz"
@@ -104,11 +107,12 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> 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? no (end of list)
 >>> using ACL "check_recipienty"
 >>> processing "accept" (TESTSUITE/test-config 30)
 >>> check hosts = not-exist.test.ex : V4NET.0.0.13
->>> no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13])
-LOG: no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13])
+>>> no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
+LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
 >>> host in "not-exist.test.ex : V4NET.0.0.13"? no (failed to find IP address for not-exist.test.ex)
 LOG: list matching forced to fail: failed to find IP address for not-exist.test.ex
 >>> accept: condition test failed in ACL "check_recipienty"
@@ -116,7 +120,7 @@ LOG: list matching forced to fail: failed to find IP address for not-exist.test.
 >>>   message: "Denied"
 >>> deny: condition test succeeded in ACL "check_recipienty"
 >>> end of ACL "check_recipienty": DENY
-LOG: H=[V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denied"
+LOG: H=(test) [V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denied"
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -129,6 +133,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> 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? no (end of list)
 >>> using ACL "check_recipienta"
 >>> processing "accept" (TESTSUITE/test-config 38)
 >>> check hosts = :
@@ -137,12 +142,12 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> processing "deny" (TESTSUITE/test-config 39)
 >>> check hosts = +include_defer : 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 [V4NET.0.0.13])
+>>> no IP address found for host test.again.dns (during SMTP connection from (test) [V4NET.0.0.13])
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 LOG: DNS lookup of "test.again.dns" deferred: accepted by +include_defer
 >>> deny: condition test succeeded in ACL "check_recipienta"
 >>> end of ACL "check_recipienta": DENY
-LOG: H=[V4NET.0.0.13] F=<userx@myhost.test.ex> rejected RCPT <a@test.ex>
+LOG: H=(test) [V4NET.0.0.13] F=<userx@myhost.test.ex> rejected RCPT <a@test.ex>
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -155,15 +160,16 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> 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? no (end of list)
 >>> using ACL "check_recipientb"
 >>> processing "accept" (TESTSUITE/test-config 44)
 >>> check hosts = test.again.dns : V4NET.0.0.13
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
->>> no IP address found for host test.again.dns (during SMTP connection from [V4NET.0.0.13])
+>>> no IP address found for host test.again.dns (during SMTP connection from (test) [V4NET.0.0.13])
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> host in "test.again.dns : V4NET.0.0.13"? list match deferred for test.again.dns
 >>> accept: condition test deferred in ACL "check_recipientb"
-LOG: H=[V4NET.0.0.13] F=<userx@test.ex> temporarily rejected RCPT <b@test.ex>: DNS lookup of "test.again.dns" deferred
+LOG: H=(test) [V4NET.0.0.13] F=<userx@test.ex> temporarily rejected RCPT <b@test.ex>: DNS lookup of "test.again.dns" deferred
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -176,11 +182,12 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> 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? no (end of list)
 >>> using ACL "check_recipientc"
 >>> processing "accept" (TESTSUITE/test-config 48)
 >>> check hosts = +ignore_defer : test.again.dns : V4NET.0.0.13
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
->>> no IP address found for host test.again.dns (during SMTP connection from [V4NET.0.0.13])
+>>> no IP address found for host test.again.dns (during SMTP connection from (test) [V4NET.0.0.13])
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> DNS lookup of "test.again.dns" deferred: item ignored by +ignore_defer
 >>> host in "+ignore_defer : test.again.dns : V4NET.0.0.13"? yes (matched "V4NET.0.0.13")