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

[exim.git] / test / stdout / 0495

diff --git a/test/stdout/0495 b/test/stdout/0495
index d445ac032fcc1db1d843c650123146ac1e91a59a..8129db3aa204dd22409190a5598141ffc648d4e7 100644 (file)
--- a/test/stdout/0495
+++ b/test/stdout/0495
@@ -1,6 +1,7 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at a.b\r
 250-SIZE 52428800\r
+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r
 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
@@ -8,11 +9,12 @@
 250 Accepted\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbJ-0005vi-00\r
+250 OK id=10HmbJ-000000005vi-0000\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at a.b\r
 250-SIZE 52428800\r
+250-LIMITS MAILMAX=1000 RCPTMAX=50000\r
 250-8BITMIME\r
 250-PIPELINING\r
 250 HELP\r
@@ -20,7 +22,7 @@
 250 Accepted\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbK-0005vi-00\r
+250 OK id=10HmbK-000000005vi-0000\r
 
 ******** SERVER ********
 Listening on port 1224 ... 
@@ -40,9 +42,9 @@ DATA
 354 OK
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
-       id 10HmaZ-0005vi-00;
+       id 10HmaZ-000000005vi-0000;
        Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -115,9 +117,9 @@ DATA
 354 OK
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
-       id 10HmbD-0005vi-00;
+       id 10HmbD-000000005vi-0000;
        Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbD-000000005vi-0000@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -143,9 +145,9 @@ DATA
 Received: from CALLER (helo=a.b)
        by myhost.test.ex with local-esmtp (Exim x.yz)
        (envelope-from <sen@der>)
-       id 10HmbJ-0005vi-00;
+       id 10HmbJ-000000005vi-0000;
        Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbJ-000000005vi-0000@myhost.test.ex>
 From: sen@der
 Date: Tue, 2 Mar 1999 09:44:33 +0000