Cutthrough: option to use transport-defined mailfrom. Bug 3071

[exim.git] / test / stderr / 3211

diff --git a/test/stderr/3211 b/test/stderr/3211
index 0b8f8c0cf13a36cd0e8dd2567af69748bc2efd71..610aff6bb80cd0873e9c0f6b24cf2a3081bc8562 100644 (file)
--- a/test/stderr/3211
+++ b/test/stderr/3211
@@ -11,7 +11,7 @@
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"

->>> processing "accept" (TESTSUITE/test-config 17)
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 17)

 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.again.dns
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@test.again.dns


@@ -19,16 +19,18 @@
 >>> calling skipped router
 >>> skipped router declined for userx@test.again.dns
 >>> calling temp router
 >>> calling skipped router
 >>> skipped router declined for userx@test.again.dns
 >>> calling temp router

->>> test.again.dns in dnssec_require_domains? no (option unset)
->>> test.again.dns in dnssec_request_domains?
->>>  list element: *
->>>  test.again.dns in dnssec_request_domains? yes (matched "*")
->>> test.again.dns in dns_again_means_nonexist? no (option unset)
->>> test.again.dns not in empty list (option unset? cannot trace name)
+>>>  check dnssec require list
+>>>   test.again.dns in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   test.again.dns in dnssec_request_domains?
+>>>    list element: *
+>>>    test.again.dns in dnssec_request_domains? yes (matched "*")
+>>>  test.again.dns in dns_again_means_nonexist? no (option unset)
+>>>  test.again.dns not in empty list (option unset? cannot trace name)

 >>> temp router: defer for userx@test.again.dns
 >>>   message: host lookup did not complete
 >>> ----------- end verify ------------
 >>> temp router: defer for userx@test.again.dns
 >>>   message: host lookup did not complete
 >>> ----------- end verify ------------

->>> accept: condition test deferred in ACL "check_recipient"
+>>> accept: condition test deferred in ACL check_recipient

 LOG: H=(test) [1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <userx@test.again.dns>: host lookup did not complete
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 LOG: H=(test) [1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <userx@test.again.dns>: host lookup did not complete
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)


@@ -43,7 +45,7 @@ LOG: H=(test) [1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <userx@test.
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"

->>> processing "accept" (TESTSUITE/test-config 17)
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 17)

 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing r1-userx@test.again.dns
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing r1-userx@test.again.dns


@@ -51,14 +53,16 @@ LOG: H=(test) [1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <userx@test.
 >>>  list element: !testdb;fail
 >>> test.again.dns in domains? yes (end of list)
 >>> calling r1 router
 >>>  list element: !testdb;fail
 >>> test.again.dns in domains? yes (end of list)
 >>> calling r1 router

->>> test.again.dns in dnssec_require_domains? no (option unset)
->>> test.again.dns in dnssec_request_domains?
->>>  list element: *
->>>  test.again.dns in dnssec_request_domains? yes (matched "*")
->>> test.again.dns in dns_again_means_nonexist? no (option unset)
->>> test.again.dns not in empty list (option unset? cannot trace name)
+>>>  check dnssec require list
+>>>   test.again.dns in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   test.again.dns in dnssec_request_domains?
+>>>    list element: *
+>>>    test.again.dns in dnssec_request_domains? yes (matched "*")
+>>>  test.again.dns in dns_again_means_nonexist? no (option unset)
+>>>  test.again.dns not in empty list (option unset? cannot trace name)

 >>> r1 router: defer for r1-userx@test.again.dns
 >>>   message: host lookup did not complete
 >>> ----------- end verify ------------
 >>> r1 router: defer for r1-userx@test.again.dns
 >>>   message: host lookup did not complete
 >>> ----------- end verify ------------

->>> accept: condition test deferred in ACL "check_recipient"
+>>> accept: condition test deferred in ACL check_recipient

 LOG: H=(test) [1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <r1-userx@test.again.dns>: host lookup did not complete
 LOG: H=(test) [1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <r1-userx@test.again.dns>: host lookup did not complete