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

[exim.git] / test / stderr / 0130

diff --git a/test/stderr/0130 b/test/stderr/0130
index 8ddb23e11fad54e5414b5aec058b5982bc318eaa..5dbcd3e4beccfbb100c610608d87908b37ed287b 100644 (file)
--- a/test/stderr/0130
+++ b/test/stderr/0130
@@ -6,6 +6,9 @@
 >>> 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)

+>>> test in helo_lookup_domains?
+>>>  list element: @
+>>>  list element: @[]

 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 21)
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 21)


@@ -13,10 +16,16 @@
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@not.test.ex
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing userx@not.test.ex

->>> not.test.ex in "test.ex"? no (end of list)
+>>> not.test.ex in "! +local_domains"?
+>>>  list element: ! +local_domains
+>>>  not.test.ex in "test.ex"?
+>>>   list element: test.ex
+>>>  not.test.ex in "test.ex"? no (end of list)

 >>> not.test.ex in "! +local_domains"? yes (end of list)
 >>> calling islocal router
 >>> not.test.ex in "! +local_domains"? yes (end of list)
 >>> calling islocal router

->>> not.test.ex in "*"? yes (matched "*")
+>>> not.test.ex in "*"?
+>>>  list element: *
+>>>  not.test.ex in "*"? yes (matched "*")

 >>> local host found for non-MX address
 >>> fully qualified name = localhost
 MUNGED: ::1 will be omitted in what follows
 >>> local host found for non-MX address
 >>> fully qualified name = localhost
 MUNGED: ::1 will be omitted in what follows