DMARC: add variables for spf/dkim alignment results. Bug 3119

[exim.git] / test / stderr / 0080

diff --git a/test/stderr/0080 b/test/stderr/0080
index e8858b5cf4b8d019b22d04eb3f561617c21e5106..d9b9ac5943039cd1fc9b82dc46665c256714ae25 100644 (file)
--- a/test/stderr/0080
+++ b/test/stderr/0080
@@ -6,23 +6,20 @@
 >>> 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)

->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 

 >>> exim.test.ex in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
 >>> exim.test.ex in helo_lookup_domains? no (end of list)
 >>> exim.test.ex in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
 >>> exim.test.ex in helo_lookup_domains? no (end of list)

->>> host in limits_advertise_hosts?
->>>  list element: !*
+>>>  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 chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
 >>>  host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)

->>> host in tls_advertise_hosts?

 >>> using ACL "check_recipient"
 >>> using ACL "check_recipient"

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

 >>> check recipients = postmaster@exim.test.ex
 >>> postmaster@exim.test.ex in "postmaster@exim.test.ex"?
 >>>  list element: postmaster@exim.test.ex
 >>> check recipients = postmaster@exim.test.ex
 >>> postmaster@exim.test.ex in "postmaster@exim.test.ex"?
 >>>  list element: postmaster@exim.test.ex


@@ -30,16 +27,16 @@
 >>>   list element: exim.test.ex
 >>>   exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
 >>>  postmaster@exim.test.ex in "postmaster@exim.test.ex"? yes (matched "postmaster@exim.test.ex")
 >>>   list element: exim.test.ex
 >>>   exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
 >>>  postmaster@exim.test.ex in "postmaster@exim.test.ex"? yes (matched "postmaster@exim.test.ex")

->>> accept: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": ACCEPT
+>>> accept: condition test succeeded in ACL check_recipient
+>>> end of ACL check_recipient: ACCEPT

 >>> using ACL "check_recipient"
 >>> using ACL "check_recipient"

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

 >>> check recipients = postmaster@exim.test.ex
 >>> list@exim.test.ex in "postmaster@exim.test.ex"?
 >>>  list element: postmaster@exim.test.ex
 >>> list@exim.test.ex in "postmaster@exim.test.ex"? no (end of list)
 >>> check recipients = postmaster@exim.test.ex
 >>> list@exim.test.ex in "postmaster@exim.test.ex"?
 >>>  list element: postmaster@exim.test.ex
 >>> list@exim.test.ex in "postmaster@exim.test.ex"? no (end of list)

->>> accept: condition test failed in ACL "check_recipient"
->>> processing "deny" (TESTSUITE/test-config 20)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "deny" (TESTSUITE/test-config 20)

 >>>   message: host is listed in $dnslist_domain
 >>> check dnslists = rbl.test.ex:rbl2.test.ex
 >>> dnslists check: rbl.test.ex
 >>>   message: host is listed in $dnslist_domain
 >>> check dnslists = rbl.test.ex:rbl2.test.ex
 >>> dnslists check: rbl.test.ex


@@ -47,8 +44,8 @@
 >>> dnslists: wrote cache entry, ttl=2
 >>> DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
 >>> => that means V4NET.11.12.14 is listed at rbl.test.ex
 >>> dnslists: wrote cache entry, ttl=2
 >>> DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
 >>> => that means V4NET.11.12.14 is listed at rbl.test.ex

->>> deny: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": DENY
+>>> deny: condition test succeeded in ACL check_recipient
+>>> end of ACL check_recipient: DENY

 LOG: H=(exim.test.ex) [V4NET.11.12.14] F=<postmaster@exim.test.ex> rejected RCPT list@exim.test.ex: host is listed in rbl.test.ex
 >>> host in ignore_fromline_hosts? no (option unset)
 LOG: H=(exim.test.ex) [V4NET.11.12.14] F=<postmaster@exim.test.ex> rejected RCPT list@exim.test.ex: host is listed in rbl.test.ex
 >>> host in ignore_fromline_hosts? no (option unset)

-LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.14] P=esmtp S=sss
+LOG: 10HmaX-000000005vi-0000 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.14] P=esmtp S=sss