DMARC: Avoid using Resent-From: header. Bug 3029

[exim.git] / test / stderr / 3205

diff --git a/test/stderr/3205 b/test/stderr/3205
index c1c1da23019586cd12d72f33b7734edf5c6a45a6..3bbbec06d1c421cd9e6235974c85504ea07f1c81 100644 (file)
--- a/test/stderr/3205
+++ b/test/stderr/3205
@@ -6,12 +6,18 @@
 >>> 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?
+>>>  list element: @
+>>>  list element: @[]
+>>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "acl_1_2_3_4"
->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 17)
 >>> check senders = testdb;defer
->>> userx@external.test.ex in "testdb;defer"? lookup deferred for testdb;defer
->>> deny: condition test deferred
-LOG: H=[1.2.3.4] F=<userx@external.test.ex> temporarily rejected RCPT <userx@test.ex>: testdb lookup forced DEFER
+>>> userx@external.test.ex in "testdb;defer"?
+>>>  list element: testdb;defer
+>>> userx@external.test.ex in "testdb;defer"? list match deferred for testdb;defer
+>>> deny: condition test deferred in ACL "acl_1_2_3_4"
+LOG: H=(test) [1.2.3.4] F=<userx@external.test.ex> temporarily rejected RCPT <userx@test.ex>: testdb lookup forced DEFER
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -20,13 +26,21 @@ LOG: H=[1.2.3.4] F=<userx@external.test.ex> temporarily rejected RCPT <userx@tes
 >>> 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?
+>>>  list element: @
+>>>  list element: @[]
+>>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "acl_4_3_2_1"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 23)
 >>> check hosts = :
+>>> host in ":"?
+>>>  list element: 
 >>> host in ":"? no (end of list)
->>> accept: condition test failed
->>> processing "deny"
+>>> accept: condition test failed in ACL "acl_4_3_2_1"
+>>> processing "deny" (TESTSUITE/test-config 24)
 >>> check hosts = testdb;defer
->>> host in "testdb;defer"? lookup deferred for testdb;defer
->>> deny: condition test deferred
-LOG: H=[4.3.2.1] F=<userx@external.test.ex> temporarily rejected RCPT <userx@test.ex>: testdb lookup forced DEFER
+>>> host in "testdb;defer"?
+>>>  list element: testdb;defer
+>>> host in "testdb;defer"? list match deferred for testdb;defer
+>>> deny: condition test deferred in ACL "acl_4_3_2_1"
+LOG: H=(test) [4.3.2.1] F=<userx@external.test.ex> temporarily rejected RCPT <userx@test.ex>: testdb lookup forced DEFER