New format for exim_message_id

1 files changed, 22 insertions, 22 deletions

diff --git a/test/mail/4560.a b/test/mail/4560.a
index b03021916..4d904278e 100644
--- a/test/mail/4560.a
+++ b/test/mail/4560.a
@@ -4,7 +4,7 @@ Authentication-Results: test.ex;
 Received: from [127.0.0.1] (helo=xxx)
 	by test.ex with smtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
-	id 10HmaX-0005vi-00
+	id 10HmaX-000000005vi-0000
 	for a@test.ex;
 	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=1; a=rsa-sha256; cv=none; d=test.ex; s=sel; t=1521752658; b=
@@ -34,7 +34,7 @@ Authentication-Results: test.ex;
 Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
-	id 10HmaZ-0005vi-00
+	id 10HmaZ-000000005vi-0000
 	for a@test.ex;
 	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
@@ -54,7 +54,7 @@ Authentication-Results: test.ex;
 Received: from [127.0.0.1] (helo=xxx)
 	by test.ex with smtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
-	id 10HmaY-0005vi-00
+	id 10HmaY-000000005vi-0000
 	for za@test.ex;
 	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test
@@ -68,7 +68,7 @@ Authentication-Results: test.ex;
 Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
-	id 10HmbC-0005vi-00
+	id 10HmbC-000000005vi-0000
 	for a@test.ex;
 	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=2; cv=pass; a=rsa-sha256; d=test.ex; s=sel;
@@ -90,7 +90,7 @@ Authentication-Results: test.ex;
 Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
-	id 10HmbB-0005vi-00
+	id 10HmbB-000000005vi-0000
 	for za@test.ex;
 	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
@@ -110,7 +110,7 @@ Authentication-Results: test.ex;
 Received: from [127.0.0.1] (helo=xxx)
 	by test.ex with smtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
-	id 10HmbA-0005vi-00
+	id 10HmbA-000000005vi-0000
 	for zza@test.ex;
 	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test
@@ -124,7 +124,7 @@ Authentication-Results: test.ex;
 Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
-	id 10HmbG-0005vi-00
+	id 10HmbG-000000005vi-0000
 	for a@test.ex;
 	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=3; cv=pass; a=rsa-sha256; d=test.ex; s=sel;
@@ -146,7 +146,7 @@ Authentication-Results: test.ex;
 Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
-	id 10HmbF-0005vi-00
+	id 10HmbF-000000005vi-0000
 	for za@test.ex;
 	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=2; cv=pass; a=rsa-sha256; d=test.ex; s=sel;
@@ -168,7 +168,7 @@ Authentication-Results: test.ex;
 Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
-	id 10HmbE-0005vi-00
+	id 10HmbE-000000005vi-0000
 	for mza@test.ex;
 	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
@@ -188,7 +188,7 @@ Authentication-Results: test.ex;
 Received: from [127.0.0.1] (helo=xxx)
 	by test.ex with smtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
-	id 10HmbD-0005vi-00
+	id 10HmbD-000000005vi-0000
 	for zmza@test.ex;
 	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test
@@ -206,7 +206,7 @@ Authentication-Results: test.ex;
 Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
-	id 10HmbL-0005vi-00
+	id 10HmbL-000000005vi-0000
 	for a@test.ex;
 	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=3; cv=fail; a=rsa-sha256; d=test.ex; s=sel;
@@ -228,7 +228,7 @@ Authentication-Results: test.ex;
 Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
-	id 10HmbK-0005vi-00
+	id 10HmbK-000000005vi-0000
 	for za@test.ex;
 	Tue, 2 Mar 1999 09:44:33 +0000
 Authentication-Results: test.ex;
@@ -237,7 +237,7 @@ Authentication-Results: test.ex;
 Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
-	id 10HmbJ-0005vi-00
+	id 10HmbJ-000000005vi-0000
 	for mza@test.ex;
 	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=2; cv=pass; a=rsa-sha256; d=test.ex; s=sel;
@@ -259,7 +259,7 @@ Authentication-Results: test.ex;
 Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
-	id 10HmbI-0005vi-00
+	id 10HmbI-000000005vi-0000
 	for zmza@test.ex;
 	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
@@ -279,7 +279,7 @@ Authentication-Results: test.ex;
 Received: from [127.0.0.1] (helo=xxx)
 	by test.ex with smtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
-	id 10HmbH-0005vi-00
+	id 10HmbH-000000005vi-0000
 	for zzmza@test.ex;
 	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test
@@ -297,7 +297,7 @@ Authentication-Results: test.ex;
 Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
-	id 10HmbO-0005vi-00
+	id 10HmbO-000000005vi-0000
 	for a@test.ex;
 	Tue, 2 Mar 1999 09:44:33 +0000
 Authentication-Results: test.ex;
@@ -306,7 +306,7 @@ Authentication-Results: test.ex;
 Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
-	id 10HmbN-0005vi-00
+	id 10HmbN-000000005vi-0000
 	for za@test.ex;
 	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=test.ex; s=sel;
@@ -326,7 +326,7 @@ Authentication-Results: test.ex;
 Received: from [127.0.0.1] (helo=xxx)
 	by test.ex with smtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
-	id 10HmbM-0005vi-00
+	id 10HmbM-000000005vi-0000
 	for zza@test.ex;
 	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test
@@ -343,7 +343,7 @@ Authentication-Results: test.ex;
 Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
-	id 10HmbQ-0005vi-00
+	id 10HmbQ-000000005vi-0000
 	for a@test.ex;
 	Tue, 2 Mar 1999 09:44:33 +0000
 ARC-Seal: i=2; cv=fail; a=rsa-sha256; d=test.ex; s=sel;
@@ -371,7 +371,7 @@ Authentication-Results: test.ex;
 Received: from [127.0.0.1] (helo=xxx)
 	by test.ex with smtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
-	id 10HmbP-0005vi-00
+	id 10HmbP-000000005vi-0000
 	for za@test.ex;
 	Tue, 2 Mar 1999 09:44:33 +0000
 Received: from dragon.trusteddomain.org (localhost [127.0.0.1])
@@ -506,7 +506,7 @@ Authentication-Results: test.ex;
 Received: from localhost ([127.0.0.1] helo=test.ex)
 	by test.ex with esmtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
-	id 10HmbS-0005vi-00
+	id 10HmbS-000000005vi-0000
 	for a@test.ex;
 	Tue, 2 Mar 1999 09:44:33 +0000
 Authentication-Results: test.ex;
@@ -514,7 +514,7 @@ Authentication-Results: test.ex;
 Received: from [127.0.0.1] (helo=xxx)
 	by test.ex with smtp (Exim x.yz)
 	(envelope-from <CALLER@bloggs.com>)
-	id 10HmbR-0005vi-00
+	id 10HmbR-000000005vi-0000
 	for za@test.ex;
 	Tue, 2 Mar 1999 09:44:33 +0000
 Subject: Test