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

[exim.git] / test / stderr / 0463

diff --git a/test/stderr/0463 b/test/stderr/0463
index 314cc21c114cef3467bbb8416faa288d811902d9..e395c225933b1e286ab215bf13597ea631dcfc1b 100644 (file)
--- a/test/stderr/0463
+++ b/test/stderr/0463
@@ -1,6 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
 Exim version x.yz ....
 changed uid/gid: forcing real = effective

-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1234

 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid


@@ -16,6 +16,8 @@ routing x@ten-1
 --------> all router <--------
 local_part=x domain=ten-1
 checking domains
 --------> all router <--------
 local_part=x domain=ten-1
 checking domains

+ten-1 in "!@mx_any"?
+ list element: !@mx_any

 DNS lookup of ten-1 (MX) using fakens
 DNS lookup of ten-1 (MX) gave NO_DATA
 returning DNS_NODATA
 DNS lookup of ten-1 (MX) using fakens
 DNS lookup of ten-1 (MX) gave NO_DATA
 returning DNS_NODATA


@@ -26,7 +28,9 @@ ten-1 in "!@mx_any"? yes (end of list)
 calling all router
 all router called for x@ten-1
   domain = ten-1
 calling all router
 all router called for x@ten-1
   domain = ten-1

-ten-1 in "*"? yes (matched "*")
+ten-1 in "*"?
+ list element: *
+ ten-1 in "*"? yes (matched "*")

 DNS lookup of ten-1 (MX) using fakens
 DNS lookup of ten-1 (MX) gave NO_DATA
 returning DNS_NODATA
 DNS lookup of ten-1 (MX) using fakens
 DNS lookup of ten-1 (MX) gave NO_DATA
 returning DNS_NODATA


@@ -47,6 +51,8 @@ routing x@ten-1.test.ex
 --------> all router <--------
 local_part=x domain=ten-1.test.ex
 checking domains
 --------> all router <--------
 local_part=x domain=ten-1.test.ex
 checking domains

+ten-1.test.ex in "!@mx_any"?
+ list element: !@mx_any

 DNS lookup of ten-1.test.ex (MX) using fakens
 DNS lookup of ten-1.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
 DNS lookup of ten-1.test.ex (MX) using fakens
 DNS lookup of ten-1.test.ex (MX) gave NO_DATA
 returning DNS_NODATA


@@ -57,7 +63,9 @@ ten-1.test.ex in "!@mx_any"? yes (end of list)
 calling all router
 all router called for x@ten-1.test.ex
   domain = ten-1.test.ex
 calling all router
 all router called for x@ten-1.test.ex
   domain = ten-1.test.ex

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

 DNS lookup of ten-1.test.ex (MX) using fakens
 DNS lookup of ten-1.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
 DNS lookup of ten-1.test.ex (MX) using fakens
 DNS lookup of ten-1.test.ex (MX) gave NO_DATA
 returning DNS_NODATA


@@ -78,4 +86,4 @@ routed by all router
   transport: smtp
   host ten-1.test.ex [V4NET.0.0.1]
 search_tidyup called
   transport: smtp
   host ten-1.test.ex [V4NET.0.0.1]
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>