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

[exim.git] / test / stderr / 3410

diff --git a/test/stderr/3410 b/test/stderr/3410
index e129996a7872c4973b5ba7743c0c8491c38c09af..926b7dd19632cff608d73b0910ad34244283985e 100644 (file)
--- a/test/stderr/3410
+++ b/test/stderr/3410
@@ -6,16 +6,35 @@
 >>> 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_5_6_9"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 19)
 >>>   message: You must authenticate
 >>> check authenticated = *
 >>> accept: condition test failed in ACL "acl_5_6_9"
 >>> accept: endpass encountered - denying access
-LOG: H=[5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
+LOG: H=(test) [5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> rhu.barb in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> rhu.barb in helo_lookup_domains? no (end of list)
->>> host in pipelining_advertise_hosts? yes (matched "*")
->>> host in auth_advertise_hosts? yes (matched "*")
+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")
+>>> host in dsn_advertise_hosts? no (option unset)
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in auth_advertise_hosts?
+>>>  list element: *
+>>>  host in auth_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
+>>> host in chunking_advertise_hosts? no (end of list)
 >>> auth1 authenticator server_condition:
 >>>   $auth1 = 
 >>>   $auth2 = userx
@@ -25,11 +44,14 @@ LOG: H=[5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
 >>>   $3 = secret
 >>> expanded string: yes
 >>> using ACL "acl_5_6_9"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 19)
 >>>   message: You must authenticate
 >>> check authenticated = *
->>> auth1 in "*"? yes (matched "*")
+>>> auth1 in "*"?
+>>>  list element: *
+>>>  auth1 in "*"? yes (matched "*")
 >>> accept: condition test succeeded in ACL "acl_5_6_9"
+>>> end of ACL "acl_5_6_9": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -38,15 +60,34 @@ LOG: H=[5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
 >>> 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_5_6_10"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 24)
 >>> check authenticated = auth1
 >>> accept: condition test failed in ACL "acl_5_6_10"
 >>> end of ACL "acl_5_6_10": implicit DENY
-LOG: H=[5.6.10.1] F=<x@y> rejected RCPT <x@y>
+LOG: H=(test) [5.6.10.1] F=<x@y> rejected RCPT <x@y>
+>>> host in smtp_accept_max_nonmail_hosts?
+>>>  list element: *
+>>>  host in smtp_accept_max_nonmail_hosts? yes (matched "*")
+>>> rhu.barb in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> rhu.barb in helo_lookup_domains? no (end of list)
->>> host in pipelining_advertise_hosts? yes (matched "*")
->>> host in auth_advertise_hosts? yes (matched "*")
+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")
+>>> host in dsn_advertise_hosts? no (option unset)
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in auth_advertise_hosts?
+>>>  list element: *
+>>>  host in auth_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
+>>> host in chunking_advertise_hosts? no (end of list)
 >>> auth1 authenticator server_condition:
 >>>   $auth1 = 
 >>>   $auth2 = userx
@@ -56,10 +97,13 @@ LOG: H=[5.6.10.1] F=<x@y> rejected RCPT <x@y>
 >>>   $3 = secret
 >>> expanded string: yes
 >>> using ACL "acl_5_6_10"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 24)
 >>> check authenticated = auth1
->>> auth1 in "auth1"? yes (matched "auth1")
+>>> auth1 in "auth1"?
+>>>  list element: auth1
+>>>  auth1 in "auth1"? yes (matched "auth1")
 >>> accept: condition test succeeded in ACL "acl_5_6_10"
+>>> end of ACL "acl_5_6_10": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
@@ -68,9 +112,21 @@ LOG: H=[5.6.10.1] F=<x@y> rejected RCPT <x@y>
 >>> 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)
+>>> rhu.barb in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]
 >>> rhu.barb in helo_lookup_domains? no (end of list)
->>> host in pipelining_advertise_hosts? yes (matched "*")
->>> host in auth_advertise_hosts? yes (matched "*")
+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")
+>>> host in dsn_advertise_hosts? no (option unset)
+>>> host in pipelining_advertise_hosts?
+>>>  list element: *
+>>>  host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in auth_advertise_hosts?
+>>>  list element: *
+>>>  host in auth_advertise_hosts? yes (matched "*")
+>>> host in chunking_advertise_hosts?
+>>> host in chunking_advertise_hosts? no (end of list)
 >>> auth2 authenticator server_condition:
 >>>   $auth1 = userx
 >>>   $auth2 = secret
@@ -78,8 +134,10 @@ LOG: H=[5.6.10.1] F=<x@y> rejected RCPT <x@y>
 >>>   $2 = secret
 >>> expanded string: yes
 >>> using ACL "acl_5_6_10"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 24)
 >>> check authenticated = auth1
+>>> auth2 in "auth1"?
+>>>  list element: auth1
 >>> auth2 in "auth1"? no (end of list)
 >>> accept: condition test failed in ACL "acl_5_6_10"
 >>> end of ACL "acl_5_6_10": implicit DENY