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

[exim.git] / test / stderr / 0403

diff --git a/test/stderr/0403 b/test/stderr/0403
index ae038834744a66dc180d7cac4b949ba08874e526..c44e370e17b38ff1a5e2ab16dec7e6b22a0b1084 100644 (file)
--- a/test/stderr/0403
+++ b/test/stderr/0403
@@ -19,15 +19,15 @@ search_tidyup called
 >>Headers received:
 
 qualify & rewrite recipients list
 >>Headers received:
 
 qualify & rewrite recipients list

-global rewrite rules
-rewrite headers
+rewrite rules on sender address
+qualify and rewrite headers

  rewrite_one_header: type=F:
    From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
  rewrite_one_header: type=F:
    From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

-I Message-Id: <E10HmaX-000000005vi-0000@mail.test.ex>
-F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ I Message-Id: <E10HmaX-000000005vi-0000@mail.test.ex>
+ F From: CALLER_NAME <CALLER@test.ex>
+   Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D
 Data file written for message 10HmaX-000000005vi-0000
 
 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D
 Data file written for message 10HmaX-000000005vi-0000


@@ -261,15 +261,15 @@ search_tidyup called
 >>Headers received:
 
 qualify & rewrite recipients list
 >>Headers received:
 
 qualify & rewrite recipients list

-global rewrite rules
-rewrite headers
+rewrite rules on sender address
+qualify and rewrite headers

  rewrite_one_header: type=F:
    From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
  rewrite_one_header: type=F:
    From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

-I Message-Id: <E10HmaY-000000005vi-0000@mail.test.ex>
-F From: CALLER_NAME <CALLER@test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ I Message-Id: <E10HmaY-000000005vi-0000@mail.test.ex>
+ F From: CALLER_NAME <CALLER@test.ex>
+   Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D
 Data file written for message 10HmaY-000000005vi-0000
 
 Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D
 Data file written for message 10HmaY-000000005vi-0000


@@ -340,6 +340,7 @@ checking domains
     in TESTSUITE/aux-fixed/0403.accountfile
   creating new cache entry
   lookup yielded: 
     in TESTSUITE/aux-fixed/0403.accountfile
   creating new cache entry
   lookup yielded: 

+  lookup yield replace by key: charlie@dom1.ain

 dom1.ain in "dom1.ain"?
  list element: dom1.ain
  dom1.ain in "dom1.ain"? yes (matched "dom1.ain")
 dom1.ain in "dom1.ain"?
  list element: dom1.ain
  dom1.ain in "dom1.ain"? yes (matched "dom1.ain")


@@ -356,6 +357,7 @@ checking local_parts
   cached data used for lookup of charlie@dom1.ain
     in TESTSUITE/aux-fixed/0403.accountfile
   lookup yielded: 
   cached data used for lookup of charlie@dom1.ain
     in TESTSUITE/aux-fixed/0403.accountfile
   lookup yielded: 

+  lookup yield replace by key: charlie@dom1.ain

 charlie in "charlie"?
  list element: charlie
  charlie in "charlie"? yes (matched "charlie")
 charlie in "charlie"?
  list element: charlie
  charlie in "charlie"? yes (matched "charlie")