Testsuite: munge for error message sizes in retry records

[exim.git] / test / stdout / 0615

diff --git a/test/stdout/0615 b/test/stdout/0615
index a6da43d1d286d18823562363addca47e44e87c61..193856673984af39046c71b54fa8470a74190e83 100644 (file)
--- a/test/stdout/0615
+++ b/test/stdout/0615
@@ -1,406 +1,407 @@
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 the.local.host.name Hello CALLER at test\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
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaY-0005vi-00\r
+250 OK id=10HmaY-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaZ-0005vi-00\r
+250 OK id=10HmaZ-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbA-0005vi-00\r
+250 OK id=10HmbA-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbB-0005vi-00\r
+250 OK id=10HmbB-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbC-0005vi-00\r
+250 OK id=10HmbC-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbD-0005vi-00\r
+250 OK id=10HmbD-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbE-0005vi-00\r
+250 OK id=10HmbE-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbF-0005vi-00\r
+250 OK id=10HmbF-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbG-0005vi-00\r
+250 OK id=10HmbG-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbH-0005vi-00\r
+250 OK id=10HmbH-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbI-0005vi-00\r
+250 OK id=10HmbI-000000005vi-0000\r
 250 Reset OK\r
 250 OK\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
 250 Reset OK\r
 250 OK\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
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbL-0005vi-00\r
+250 OK id=10HmbL-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbM-0005vi-00\r
+250 OK id=10HmbM-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbN-0005vi-00\r
+250 OK id=10HmbN-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbO-0005vi-00\r
+250 OK id=10HmbO-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbP-0005vi-00\r
+250 OK id=10HmbP-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbQ-0005vi-00\r
+250 OK id=10HmbQ-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbR-0005vi-00\r
+250 OK id=10HmbR-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbS-0005vi-00\r
+250 OK id=10HmbS-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbT-0005vi-00\r
+250 OK id=10HmbT-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbU-0005vi-00\r
+250 OK id=10HmbU-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbV-0005vi-00\r
+250 OK id=10HmbV-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbW-0005vi-00\r
+250 OK id=10HmbW-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbX-0005vi-00\r
+250 OK id=10HmbX-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbY-0005vi-00\r
+250 OK id=10HmbY-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbZ-0005vi-00\r
+250 OK id=10HmbZ-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcA-0005vi-00\r
+250 OK id=10HmcA-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcB-0005vi-00\r
+250 OK id=10HmcB-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcC-0005vi-00\r
+250 OK id=10HmcC-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcD-0005vi-00\r
+250 OK id=10HmcD-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcE-0005vi-00\r
+250 OK id=10HmcE-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcF-0005vi-00\r
+250 OK id=10HmcF-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcG-0005vi-00\r
+250 OK id=10HmcG-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcH-0005vi-00\r
+250 OK id=10HmcH-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcI-0005vi-00\r
+250 OK id=10HmcI-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcJ-0005vi-00\r
+250 OK id=10HmcJ-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcK-0005vi-00\r
+250 OK id=10HmcK-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcL-0005vi-00\r
+250 OK id=10HmcL-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcM-0005vi-00\r
+250 OK id=10HmcM-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcN-0005vi-00\r
+250 OK id=10HmcN-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcO-0005vi-00\r
+250 OK id=10HmcO-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcP-0005vi-00\r
+250 OK id=10HmcP-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcQ-0005vi-00\r
+250 OK id=10HmcQ-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcR-0005vi-00\r
+250 OK id=10HmcR-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcS-0005vi-00\r
+250 OK id=10HmcS-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcT-0005vi-00\r
+250 OK id=10HmcT-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcU-0005vi-00\r
+250 OK id=10HmcU-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcV-0005vi-00\r
+250 OK id=10HmcV-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcW-0005vi-00\r
+250 OK id=10HmcW-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcX-0005vi-00\r
+250 OK id=10HmcX-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcY-0005vi-00\r
+250 OK id=10HmcY-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmcZ-0005vi-00\r
+250 OK id=10HmcZ-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdA-0005vi-00\r
+250 OK id=10HmdA-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdB-0005vi-00\r
+250 OK id=10HmdB-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdC-0005vi-00\r
+250 OK id=10HmdC-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdD-0005vi-00\r
+250 OK id=10HmdD-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdE-0005vi-00\r
+250 OK id=10HmdE-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdF-0005vi-00\r
+250 OK id=10HmdF-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdG-0005vi-00\r
+250 OK id=10HmdG-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdH-0005vi-00\r
+250 OK id=10HmdH-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdI-0005vi-00\r
+250 OK id=10HmdI-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdJ-0005vi-00\r
+250 OK id=10HmdJ-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdK-0005vi-00\r
+250 OK id=10HmdK-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdL-0005vi-00\r
+250 OK id=10HmdL-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdM-0005vi-00\r
+250 OK id=10HmdM-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdN-0005vi-00\r
+250 OK id=10HmdN-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdO-0005vi-00\r
+250 OK id=10HmdO-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdP-0005vi-00\r
+250 OK id=10HmdP-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdQ-0005vi-00\r
+250 OK id=10HmdQ-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdR-0005vi-00\r
+250 OK id=10HmdR-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdS-0005vi-00\r
+250 OK id=10HmdS-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdT-0005vi-00\r
+250 OK id=10HmdT-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdU-0005vi-00\r
+250 OK id=10HmdU-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdV-0005vi-00\r
+250 OK id=10HmdV-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdW-0005vi-00\r
+250 OK id=10HmdW-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdX-0005vi-00\r
+250 OK id=10HmdX-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdY-0005vi-00\r
+250 OK id=10HmdY-000000005vi-0000\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmdZ-0005vi-00\r
+250 OK id=10HmdZ-000000005vi-0000\r
 221 the.local.host.name closing connection\r