LibreSSL: fixes pulled from OpenBSD patchset

[exim.git] / test / mail / 0021.ok

diff --git a/test/mail/0021.ok b/test/mail/0021.ok
index 2691df465cc57ebfe84827d141cb4d1e8f6746e5..c77fa795a6cafbcc2096b02ba1236912349cf3e6 100644 (file)
--- a/test/mail/0021.ok
+++ b/test/mail/0021.ok
@@ -1,13 +1,14 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)

-       id 10HmbF-0005vi-00
-       for ok@test2; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbF-000000005vi-0000
+       for ok@test2;
+       Tue, 2 Mar 1999 09:44:33 +0000

 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: ok@test2
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: ok@test2

-References: <E10HmaZ-0005vi-00@myhost.test.ex>
+References: <E10HmaZ-000000005vi-0000@myhost.test.ex>

 Subject: Mail failure - rejected by local scanning code
 Subject: Mail failure - rejected by local scanning code

-Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbF-000000005vi-0000@myhost.test.ex>

 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that


@@ -19,9 +20,10 @@ checks incoming messages on this system. The following error was given:
 
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <ok@test2>)
 
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <ok@test2>)

-       id 10HmaZ-0005vi-00
-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+       id 10HmaZ-000000005vi-0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex>

 From: ok@test2
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: ok@test2
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 


@@ -29,14 +31,15 @@ Test message 3.
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)

-       id 10HmbH-0005vi-00
-       for ok@test4; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbH-000000005vi-0000
+       for ok@test4;
+       Tue, 2 Mar 1999 09:44:33 +0000

 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: ok@test4
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: ok@test4

-References: <E10HmbA-0005vi-00@myhost.test.ex>
+References: <E10HmbA-000000005vi-0000@myhost.test.ex>

 Subject: Mail failure - rejected by local scanning code
 Subject: Mail failure - rejected by local scanning code

-Message-Id: <E10HmbH-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbH-000000005vi-0000@myhost.test.ex>

 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that


@@ -48,9 +51,10 @@ checks incoming messages on this system. The following error was given:
 
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <ok@test4>)
 
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <ok@test4>)

-       id 10HmbA-0005vi-00
-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
+       id 10HmbA-000000005vi-0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex>

 From: ok@test4
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: ok@test4
 Date: Tue, 2 Mar 1999 09:44:33 +0000