New format for exim_message_id

57 files changed, 8 insertions, 8 deletions

diff --git a/test/msglog/0031.10HmaY-0005vi-00 b/test/msglog/0031.10HmaY-000000005vi-0000
index 636918604..636918604 100644
--- a/test/msglog/0031.10HmaY-0005vi-00
+++ b/test/msglog/0031.10HmaY-000000005vi-0000
diff --git a/test/msglog/0031.10HmaZ-0005vi-00 b/test/msglog/0031.10HmaZ-000000005vi-0000
index f9305ef3d..f9305ef3d 100644
--- a/test/msglog/0031.10HmaZ-0005vi-00
+++ b/test/msglog/0031.10HmaZ-000000005vi-0000
diff --git a/test/msglog/0071.10HmaX-0005vi-00 b/test/msglog/0071.10HmaX-000000005vi-0000
index 4810ce34e..4810ce34e 100644
--- a/test/msglog/0071.10HmaX-0005vi-00
+++ b/test/msglog/0071.10HmaX-000000005vi-0000
diff --git a/test/msglog/0076.10HmaX-0005vi-00 b/test/msglog/0076.10HmaX-000000005vi-0000
index bb191544e..bb191544e 100644
--- a/test/msglog/0076.10HmaX-0005vi-00
+++ b/test/msglog/0076.10HmaX-000000005vi-0000
diff --git a/test/msglog/0095.10HmbF-0005vi-00 b/test/msglog/0095.10HmbF-000000005vi-0000
index 9a84148f3..9a84148f3 100644
--- a/test/msglog/0095.10HmbF-0005vi-00
+++ b/test/msglog/0095.10HmbF-000000005vi-0000
diff --git a/test/msglog/0102.10HmbE-0005vi-00 b/test/msglog/0102.10HmbE-000000005vi-0000
index 8779d6350..8779d6350 100644
--- a/test/msglog/0102.10HmbE-0005vi-00
+++ b/test/msglog/0102.10HmbE-000000005vi-0000
diff --git a/test/msglog/0102.10HmbF-0005vi-00 b/test/msglog/0102.10HmbF-000000005vi-0000
index 92ac46ba1..92ac46ba1 100644
--- a/test/msglog/0102.10HmbF-0005vi-00
+++ b/test/msglog/0102.10HmbF-000000005vi-0000
diff --git a/test/msglog/0103.10HmbB-0005vi-00 b/test/msglog/0103.10HmbB-000000005vi-0000
index 3afafd2e9..3afafd2e9 100644
--- a/test/msglog/0103.10HmbB-0005vi-00
+++ b/test/msglog/0103.10HmbB-000000005vi-0000
diff --git a/test/msglog/0106.10HmaX-0005vi-00 b/test/msglog/0106.10HmaX-000000005vi-0000
index 4d612288b..4d612288b 100644
--- a/test/msglog/0106.10HmaX-0005vi-00
+++ b/test/msglog/0106.10HmaX-000000005vi-0000
diff --git a/test/msglog/0106.10HmaY-0005vi-00 b/test/msglog/0106.10HmaY-000000005vi-0000
index 23d8bab2f..23d8bab2f 100644
--- a/test/msglog/0106.10HmaY-0005vi-00
+++ b/test/msglog/0106.10HmaY-000000005vi-0000
diff --git a/test/msglog/0107.10HmaX-0005vi-00 b/test/msglog/0107.10HmaX-000000005vi-0000
index b9feb505a..b9feb505a 100644
--- a/test/msglog/0107.10HmaX-0005vi-00
+++ b/test/msglog/0107.10HmaX-000000005vi-0000
diff --git a/test/msglog/0109.10HmaX-0005vi-00 b/test/msglog/0109.10HmaX-000000005vi-0000
index 842e692b4..842e692b4 100644
--- a/test/msglog/0109.10HmaX-0005vi-00
+++ b/test/msglog/0109.10HmaX-000000005vi-0000
diff --git a/test/msglog/0116.10HmaX-0005vi-00 b/test/msglog/0116.10HmaX-000000005vi-0000
index f70f9740b..f70f9740b 100644
--- a/test/msglog/0116.10HmaX-0005vi-00
+++ b/test/msglog/0116.10HmaX-000000005vi-0000
diff --git a/test/msglog/0116.10HmaY-0005vi-00 b/test/msglog/0116.10HmaY-000000005vi-0000
index fadba670f..fadba670f 100644
--- a/test/msglog/0116.10HmaY-0005vi-00
+++ b/test/msglog/0116.10HmaY-000000005vi-0000
diff --git a/test/msglog/0119.10HmaX-0005vi-00 b/test/msglog/0119.10HmaX-000000005vi-0000
index 525dc2b17..525dc2b17 100644
--- a/test/msglog/0119.10HmaX-0005vi-00
+++ b/test/msglog/0119.10HmaX-000000005vi-0000
diff --git a/test/msglog/0122.10HmaX-0005vi-00 b/test/msglog/0122.10HmaX-000000005vi-0000
index 99f5f87aa..99f5f87aa 100644
--- a/test/msglog/0122.10HmaX-0005vi-00
+++ b/test/msglog/0122.10HmaX-000000005vi-0000
diff --git a/test/msglog/0122.10HmaY-0005vi-00 b/test/msglog/0122.10HmaY-000000005vi-0000
index f61d7ba7b..f61d7ba7b 100644
--- a/test/msglog/0122.10HmaY-0005vi-00
+++ b/test/msglog/0122.10HmaY-000000005vi-0000
diff --git a/test/msglog/0122.10HmaZ-0005vi-00 b/test/msglog/0122.10HmaZ-000000005vi-0000
index f080d705b..f080d705b 100644
--- a/test/msglog/0122.10HmaZ-0005vi-00
+++ b/test/msglog/0122.10HmaZ-000000005vi-0000
diff --git a/test/msglog/0128.10HmaX-0005vi-00 b/test/msglog/0128.10HmaX-000000005vi-0000
index 930261ebb..930261ebb 100644
--- a/test/msglog/0128.10HmaX-0005vi-00
+++ b/test/msglog/0128.10HmaX-000000005vi-0000
diff --git a/test/msglog/0130.10HmaX-0005vi-00 b/test/msglog/0130.10HmaX-000000005vi-0000
index 7b631d223..7b631d223 100644
--- a/test/msglog/0130.10HmaX-0005vi-00
+++ b/test/msglog/0130.10HmaX-000000005vi-0000
diff --git a/test/msglog/0132.10HmaX-0005vi-00 b/test/msglog/0132.10HmaX-000000005vi-0000
index da30e099b..da30e099b 100644
--- a/test/msglog/0132.10HmaX-0005vi-00
+++ b/test/msglog/0132.10HmaX-000000005vi-0000
diff --git a/test/msglog/0197.10HmaX-0005vi-00 b/test/msglog/0197.10HmaX-000000005vi-0000
index 52ed773b1..52ed773b1 100644
--- a/test/msglog/0197.10HmaX-0005vi-00
+++ b/test/msglog/0197.10HmaX-000000005vi-0000
diff --git a/test/msglog/0197.10HmaY-0005vi-00 b/test/msglog/0197.10HmaY-000000005vi-0000
index 2cab0a8fa..2cab0a8fa 100644
--- a/test/msglog/0197.10HmaY-0005vi-00
+++ b/test/msglog/0197.10HmaY-000000005vi-0000
diff --git a/test/msglog/0198.10HmaX-0005vi-00 b/test/msglog/0198.10HmaX-000000005vi-0000
index 457703e4e..54a0dd917 100644
--- a/test/msglog/0198.10HmaX-0005vi-00
+++ b/test/msglog/0198.10HmaX-000000005vi-0000
@@ -1,4 +1,4 @@
-1999-03-02 09:44:33 Received from CALLER@the.local.host.name U=CALLER P=local-bsmtp S=sss id=E10HmaY-0005vi-00@the.local.host.name
+1999-03-02 09:44:33 Received from CALLER@the.local.host.name U=CALLER P=local-bsmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name
 1999-03-02 09:44:33 routing failed for usery@copy.domain: Unrouteable address
 1999-03-02 09:44:33 H=V4NET.0.0.1 [V4NET.0.0.1] Network unreachable
 1999-03-02 09:44:33 userx@copy.domain R=check_file T=pass_on defer (dd): Network unreachable
diff --git a/test/msglog/0198.10HmaZ-0005vi-00 b/test/msglog/0198.10HmaY-000000005vi-0000
index a4521da0d..62f023601 100644
--- a/test/msglog/0198.10HmaZ-0005vi-00
+++ b/test/msglog/0198.10HmaY-000000005vi-0000
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Received from <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
+1999-03-02 09:44:33 Received from <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 CALLER@the.local.host.name R=passall T=pass_on defer (-54): retry time not reached for any host for 'the.local.host.name'
diff --git a/test/msglog/0198.10HmbA-0005vi-00 b/test/msglog/0198.10HmaZ-000000005vi-0000
index a71ed863d..e728eba83 100644
--- a/test/msglog/0198.10HmbA-0005vi-00
+++ b/test/msglog/0198.10HmaZ-000000005vi-0000
@@ -1,3 +1,3 @@
-1999-03-02 09:44:33 Received from doesn't@matter U=CALLER P=local-bsmtp S=sss id=E10HmbB-0005vi-00@the.local.host.name
+1999-03-02 09:44:33 Received from doesn't@matter U=CALLER P=local-bsmtp S=sss id=E10HmaY-0005vi-00@the.local.host.name
 1999-03-02 09:44:33 routing failed for y@copy.domain: Unrouteable address
 1999-03-02 09:44:33 x@copy.domain R=check_file T=pass_on defer (-54): retry time not reached for any host for 'copy.domain'
diff --git a/test/msglog/0198.10HmbC-0005vi-00 b/test/msglog/0198.10HmbA-000000005vi-0000
index d26649790..e4eed185b 100644
--- a/test/msglog/0198.10HmbC-0005vi-00
+++ b/test/msglog/0198.10HmbA-000000005vi-0000
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Received from <> R=10HmbA-0005vi-00 U=EXIMUSER P=local S=sss
+1999-03-02 09:44:33 Received from <> R=10HmaZ-000000005vi-0000 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 doesn't@matter R=passall T=pass_on defer (-54): retry time not reached for any host for 'matter'
diff --git a/test/msglog/0208.10HmaX-0005vi-00 b/test/msglog/0208.10HmaX-000000005vi-0000
index 3ac99ebd0..3ac99ebd0 100644
--- a/test/msglog/0208.10HmaX-0005vi-00
+++ b/test/msglog/0208.10HmaX-000000005vi-0000
diff --git a/test/msglog/0230.10HmbC-0005vi-00 b/test/msglog/0230.10HmbC-000000005vi-0000
index 6708b1451..6708b1451 100644
--- a/test/msglog/0230.10HmbC-0005vi-00
+++ b/test/msglog/0230.10HmbC-000000005vi-0000
diff --git a/test/msglog/0233.10HmaX-0005vi-00 b/test/msglog/0233.10HmaX-000000005vi-0000
index 669647fce..669647fce 100644
--- a/test/msglog/0233.10HmaX-0005vi-00
+++ b/test/msglog/0233.10HmaX-000000005vi-0000
diff --git a/test/msglog/0233.10HmbA-0005vi-00 b/test/msglog/0233.10HmbA-000000005vi-0000
index 0840c1df2..0840c1df2 100644
--- a/test/msglog/0233.10HmbA-0005vi-00
+++ b/test/msglog/0233.10HmbA-000000005vi-0000
diff --git a/test/msglog/0233.10HmbB-0005vi-00 b/test/msglog/0233.10HmbB-000000005vi-0000
index 0840c1df2..0840c1df2 100644
--- a/test/msglog/0233.10HmbB-0005vi-00
+++ b/test/msglog/0233.10HmbB-000000005vi-0000
diff --git a/test/msglog/0233.10HmbD-0005vi-00 b/test/msglog/0233.10HmbD-000000005vi-0000
index 0840c1df2..0840c1df2 100644
--- a/test/msglog/0233.10HmbD-0005vi-00
+++ b/test/msglog/0233.10HmbD-000000005vi-0000
diff --git a/test/msglog/0247.10HmaX-0005vi-00 b/test/msglog/0247.10HmaX-000000005vi-0000
index 36274935b..36274935b 100644
--- a/test/msglog/0247.10HmaX-0005vi-00
+++ b/test/msglog/0247.10HmaX-000000005vi-0000
diff --git a/test/msglog/0295.10HmaZ-0005vi-00 b/test/msglog/0295.10HmaZ-000000005vi-0000
index ff4e5940c..ff4e5940c 100644
--- a/test/msglog/0295.10HmaZ-0005vi-00
+++ b/test/msglog/0295.10HmaZ-000000005vi-0000
diff --git a/test/msglog/0332.10HmaY-0005vi-00 b/test/msglog/0332.10HmaY-000000005vi-0000
index 98d462571..98d462571 100644
--- a/test/msglog/0332.10HmaY-0005vi-00
+++ b/test/msglog/0332.10HmaY-000000005vi-0000
diff --git a/test/msglog/0333.10HmaY-0005vi-00 b/test/msglog/0333.10HmaY-000000005vi-0000
index 98d462571..98d462571 100644
--- a/test/msglog/0333.10HmaY-0005vi-00
+++ b/test/msglog/0333.10HmaY-000000005vi-0000
diff --git a/test/msglog/0356.10HmaX-0005vi-00 b/test/msglog/0356.10HmaX-000000005vi-0000
index 18f6d2bd4..18f6d2bd4 100644
--- a/test/msglog/0356.10HmaX-0005vi-00
+++ b/test/msglog/0356.10HmaX-000000005vi-0000
diff --git a/test/msglog/0420.10HmaX-0005vi-00 b/test/msglog/0420.10HmaX-000000005vi-0000
index 518070603..518070603 100644
--- a/test/msglog/0420.10HmaX-0005vi-00
+++ b/test/msglog/0420.10HmaX-000000005vi-0000
diff --git a/test/msglog/0420.10HmaY-0005vi-00 b/test/msglog/0420.10HmaY-000000005vi-0000
index 532c7a67a..532c7a67a 100644
--- a/test/msglog/0420.10HmaY-0005vi-00
+++ b/test/msglog/0420.10HmaY-000000005vi-0000
diff --git a/test/msglog/0424.10HmaY-0005vi-00 b/test/msglog/0424.10HmaY-000000005vi-0000
index 84160efe8..48fcb1d81 100644
--- a/test/msglog/0424.10HmaY-0005vi-00
+++ b/test/msglog/0424.10HmaY-000000005vi-0000
@@ -1,3 +1,3 @@
-1999-03-02 09:44:33 Received from <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
+1999-03-02 09:44:33 Received from <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 CALLER@test.ex R=r1: Return_path is: <>
 *** Frozen (delivery error message)
diff --git a/test/msglog/0486.10HmaX-0005vi-00 b/test/msglog/0486.10HmaX-000000005vi-0000
index 90533c3f1..90533c3f1 100644
--- a/test/msglog/0486.10HmaX-0005vi-00
+++ b/test/msglog/0486.10HmaX-000000005vi-0000
diff --git a/test/msglog/0486.10HmaY-0005vi-00 b/test/msglog/0486.10HmaY-000000005vi-0000
index c0dc5fb52..c0dc5fb52 100644
--- a/test/msglog/0486.10HmaY-0005vi-00
+++ b/test/msglog/0486.10HmaY-000000005vi-0000
diff --git a/test/msglog/0502.10HmaX-0005vi-00 b/test/msglog/0502.10HmaX-000000005vi-0000
index 28fa6c6e0..28fa6c6e0 100644
--- a/test/msglog/0502.10HmaX-0005vi-00
+++ b/test/msglog/0502.10HmaX-000000005vi-0000
diff --git a/test/msglog/0502.10HmaY-0005vi-00 b/test/msglog/0502.10HmaY-000000005vi-0000
index 28fa6c6e0..28fa6c6e0 100644
--- a/test/msglog/0502.10HmaY-0005vi-00
+++ b/test/msglog/0502.10HmaY-000000005vi-0000
diff --git a/test/msglog/0564.10HmaX-0005vi-00 b/test/msglog/0564.10HmaX-000000005vi-0000
index 3b44e8802..3b44e8802 100644
--- a/test/msglog/0564.10HmaX-0005vi-00
+++ b/test/msglog/0564.10HmaX-000000005vi-0000
diff --git a/test/msglog/0593.10HmaX-0005vi-00 b/test/msglog/0593.10HmaX-000000005vi-0000
index fa93f2509..fa93f2509 100644
--- a/test/msglog/0593.10HmaX-0005vi-00
+++ b/test/msglog/0593.10HmaX-000000005vi-0000
diff --git a/test/msglog/1157.10HmbM-0005vi-00 b/test/msglog/1157.10HmbM-000000005vi-0000
index 70e707538..e2d7f7616 100644
--- a/test/msglog/1157.10HmbM-0005vi-00
+++ b/test/msglog/1157.10HmbM-000000005vi-0000
@@ -1 +1 @@
-1999-03-02 09:44:33 Received from CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbJ-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 Received from CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbJ-000000005vi-0000@myhost.test.ex
diff --git a/test/msglog/1157.10HmbN-0005vi-00 b/test/msglog/1157.10HmbN-000000005vi-0000
index dbe4dd959..70e01c739 100644
--- a/test/msglog/1157.10HmbN-0005vi-00
+++ b/test/msglog/1157.10HmbN-000000005vi-0000
@@ -1 +1 @@
-1999-03-02 09:44:33 Received from CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbL-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 Received from CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbL-000000005vi-0000@myhost.test.ex
diff --git a/test/msglog/1157.10HmbO-0005vi-00 b/test/msglog/1157.10HmbO-000000005vi-0000
index 2a90570c8..758332ea3 100644
--- a/test/msglog/1157.10HmbO-0005vi-00
+++ b/test/msglog/1157.10HmbO-000000005vi-0000
@@ -1 +1 @@
-1999-03-02 09:44:33 Received from CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbK-0005vi-00@myhost.test.ex
+1999-03-02 09:44:33 Received from CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1]:1113 P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss id=E10HmbK-000000005vi-0000@myhost.test.ex
diff --git a/test/msglog/5000.10HmaX-0005vi-00 b/test/msglog/5000.10HmaX-000000005vi-0000
index e50b21cf1..e50b21cf1 100644
--- a/test/msglog/5000.10HmaX-0005vi-00
+++ b/test/msglog/5000.10HmaX-000000005vi-0000
diff --git a/test/msglog/5000.10HmbA-0005vi-00 b/test/msglog/5000.10HmbA-000000005vi-0000
index b932004a7..b932004a7 100644
--- a/test/msglog/5000.10HmbA-0005vi-00
+++ b/test/msglog/5000.10HmbA-000000005vi-0000
diff --git a/test/msglog/5000.10HmbG-0005vi-00 b/test/msglog/5000.10HmbG-000000005vi-0000
index 67d2d43d2..67d2d43d2 100644
--- a/test/msglog/5000.10HmbG-0005vi-00
+++ b/test/msglog/5000.10HmbG-000000005vi-0000
diff --git a/test/msglog/5001.10HmaX-0005vi-00 b/test/msglog/5001.10HmaX-000000005vi-0000
index 798d07465..798d07465 100644
--- a/test/msglog/5001.10HmaX-0005vi-00
+++ b/test/msglog/5001.10HmaX-000000005vi-0000
diff --git a/test/msglog/5050.10HmbD-0005vi-00 b/test/msglog/5050.10HmbD-000000005vi-0000
index 8779d6350..8779d6350 100644
--- a/test/msglog/5050.10HmbD-0005vi-00
+++ b/test/msglog/5050.10HmbD-000000005vi-0000
diff --git a/test/msglog/5050.10HmbE-0005vi-00 b/test/msglog/5050.10HmbE-000000005vi-0000
index 92ac46ba1..92ac46ba1 100644
--- a/test/msglog/5050.10HmbE-0005vi-00
+++ b/test/msglog/5050.10HmbE-000000005vi-0000
diff --git a/test/msglog/5200.10HmaX-0005vi-00 b/test/msglog/5200.10HmaX-000000005vi-0000
index 3e7a0e555..3e7a0e555 100644
--- a/test/msglog/5200.10HmaX-0005vi-00
+++ b/test/msglog/5200.10HmaX-000000005vi-0000