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

[exim.git] / test / stderr / 0487

diff --git a/test/stderr/0487 b/test/stderr/0487
index c28c3f34f502d08e294987fbc960424884ff5341..e703c88d907597e5e9694b35313e1803c6619e12 100644 (file)
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -19,6 +19,8 @@ LOG: smtp_connection MAIN
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< ehlo x.y
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< ehlo x.y

+ list element: *
+  in limits_advertise_hosts? yes (matched "*")

  in dsn_advertise_hosts? no (option unset)
  in pipelining_advertise_hosts?
  list element: *
  in dsn_advertise_hosts? no (option unset)
  in pipelining_advertise_hosts?
  list element: *


@@ -27,6 +29,7 @@ SMTP<< ehlo x.y
  in chunking_advertise_hosts? no (end of list)
 SMTP>> 250-myhost.test.ex Hello CALLER at x.y
        250-SIZE 52428800
  in chunking_advertise_hosts? no (end of list)
 SMTP>> 250-myhost.test.ex Hello CALLER at x.y
        250-SIZE 52428800

+       250-LIMITS MAILMAX=1000 RCPTMAX=50000

        250-8BITMIME
        250-PIPELINING
        250 HELP
        250-8BITMIME
        250-PIPELINING
        250 HELP


@@ -46,15 +49,15 @@ search_tidyup called
 From: unqualified
 
 qualify & rewrite recipients list
 From: unqualified
 
 qualify & rewrite recipients list

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

  rewrite_one_header: type=F:
    From: unqualified
 search_tidyup called
 >>Headers after rewriting and local additions:
  rewrite_one_header: type=F:
    From: unqualified
 search_tidyup called
 >>Headers after rewriting and local additions:

-F From: unqualified
-I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ F From: unqualified
+ I Message-Id: <E10HmaX-000000005vi-0000@myhost.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