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

[exim.git] / test / stdout / 4015

diff --git a/test/stdout/4015 b/test/stdout/4015
index 7e1d83e89d4ff17fba757afb6c7b004104d063bf..af8161d0fe965f6476aa7e2693e97cfaff73a6b0 100644 (file)
--- a/test/stdout/4015
+++ b/test/stdout/4015
@@ -1,13 +1,14 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello fromuser at test.ex\r
 250-SIZE 52428800\r
+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r
 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaX-0005vi-00\r
+250 OK id=10HmaX-000000005vi-0000\r
 221 myhost.test.ex closing connection\r
 
 ******** SERVER ********
@@ -15,7 +16,7 @@ Listening on port 7833 ...
 Connection request from [127.0.0.1]
 <REPORT SPAMC/1.2
 <User: nobody
-<Content-length: 465
+<Content-length: 480
 <
 <From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 <X-Envelope-From: <fromuser@myhost.test.ex>
@@ -23,10 +24,11 @@ Connection request from [127.0.0.1]
 <Received: from fromuser (helo=test.ex)
 <      by myhost.test.ex with local-esmtp (Exim x.yz)
 <      (envelope-from <fromuser@myhost.test.ex>)
-<      id 10HmaX-0005vi-00
-<      for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+<      id 10HmaX-000000005vi-0000
+<      for userx@test.ex;
+<      Tue, 2 Mar 1999 09:44:33 +0000
 <Content-type: text/plain
-<Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+<Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>
 <From: fromuser@myhost.test.ex
 <Date: Tue, 2 Mar 1999 09:44:33 +0000
 <