diff options
Diffstat (limited to 'test/stdout')
284 files changed, 1455 insertions, 1435 deletions
diff --git a/test/stdout/0005 b/test/stdout/0005 index 0aaf1b52d..179581456 100644 --- a/test/stdout/0005 +++ b/test/stdout/0005 @@ -3,19 +3,19 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 the.local.host.name closing connection
diff --git a/test/stdout/0015 b/test/stdout/0015 index 1949f3865..07c87514e 100644 --- a/test/stdout/0015 +++ b/test/stdout/0015 @@ -13,10 +13,10 @@ DATA 300 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmbE-0005vi-00 + id 10HmbE-000000005vi-0000 for S+userx@Test.Ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbE-0005vi-00@the.local.host.name> +Message-Id: <E10HmbE-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -39,10 +39,10 @@ DATA 300 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmbG-0005vi-00 + id 10HmbG-000000005vi-0000 for Userx-S@Test.Ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbG-0005vi-00@the.local.host.name> +Message-Id: <E10HmbG-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0021 b/test/stdout/0021 index 64f9a1c1d..c7b552f3d 100644 --- a/test/stdout/0021 +++ b/test/stdout/0021 @@ -15,12 +15,12 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbI-0005vi-00
+250 OK id=10HmbI-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
550 Administrative prohibition
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbL-0005vi-00
+250 OK id=10HmbL-000000005vi-0000
221 myhost.test.ex closing connection
diff --git a/test/stdout/0022 b/test/stdout/0022 index 67c0e10e1..adb4b169a 100644 --- a/test/stdout/0022 +++ b/test/stdout/0022 @@ -8,7 +8,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbF-0005vi-00
+250 OK id=10HmbF-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -23,7 +23,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbG-0005vi-00
+250 OK id=10HmbG-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -38,7 +38,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbH-0005vi-00
+250 OK id=10HmbH-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -94,20 +94,20 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
250 OK
250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
221 myhost.test.ex closing connection
**** SMTP testing session as if from host V4NET.9.8.7 @@ -127,11 +127,11 @@ 250 myhost.test.ex Hello test [V4NET.9.8.7]
250 OK
550 forcibly dropped
- 0m sss 10HmaX-0005vi-00 <CALLER@test.ex> *** frozen *** + 0m 304 10HmaX-000000005vi-0000 <CALLER@test.ex> *** frozen *** accept@y freeze@y - 0m sss 10HmaZ-0005vi-00 <CALLER@test.ex> + 0m 306 10HmaZ-000000005vi-0000 <CALLER@test.ex> queue_only@y accept@y @@ -157,7 +157,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> Testing >>> . ??? 250 -<<< 250 OK id=10HmbB-0005vi-00 +<<< 250 OK id=10HmbB-000000005vi-0000 >>> mail from:<x@y> ??? 250 <<< 250 OK @@ -171,7 +171,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> Testing 2 >>> . ??? 250 -<<< 250 OK id=10HmbC-0005vi-00 +<<< 250 OK id=10HmbC-000000005vi-0000 >>> mail from:<x@y> ??? 250 <<< 250 OK @@ -188,7 +188,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> Testing 3 >>> . ??? 250 -<<< 250 OK id=10HmbD-0005vi-00 +<<< 250 OK id=10HmbD-000000005vi-0000 >>> mail from:<x@y> ??? 250 <<< 250 OK @@ -202,7 +202,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> Testing 4 >>> . ??? 250 -<<< 250 OK id=10HmbE-0005vi-00 +<<< 250 OK id=10HmbE-000000005vi-0000 >>> mail from:<x@y> ??? 250 <<< 250 OK @@ -213,26 +213,26 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 221 <<< 221 myhost.test.ex closing connection End of script - 0m sss 10HmaX-0005vi-00 <CALLER@test.ex> *** frozen *** + 0m 304 10HmaX-000000005vi-0000 <CALLER@test.ex> *** frozen *** accept@y freeze@y - 0m sss 10HmaZ-0005vi-00 <CALLER@test.ex> + 0m 306 10HmaZ-000000005vi-0000 <CALLER@test.ex> queue_only@y accept@y - 0m sss 10HmbB-0005vi-00 <x@y> *** frozen *** + 0m 174 10HmbB-000000005vi-0000 <x@y> *** frozen *** accept@y freeze@y - 0m sss 10HmbC-0005vi-00 <x@y> + 0m 190 10HmbC-000000005vi-0000 <x@y> accept@y - 0m sss 10HmbD-0005vi-00 <x@y> + 0m 176 10HmbD-000000005vi-0000 <x@y> queue_only@y accept@y - 0m sss 10HmbE-0005vi-00 <x@y> + 0m 190 10HmbE-000000005vi-0000 <x@y> accept@y Connecting to 127.0.0.1 port 1225 ... connected diff --git a/test/stdout/0023 b/test/stdout/0023 index 6f5af965f..0ee7d2599 100644 --- a/test/stdout/0023 +++ b/test/stdout/0023 @@ -397,14 +397,14 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test [32.32.32.32]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
**** SMTP testing session as if from host 33.33.33.33 @@ -432,71 +432,71 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test [56.56.56.56]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbC-0005vi-00
+250 OK id=10HmbC-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbD-0005vi-00
+250 OK id=10HmbD-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbE-0005vi-00
+250 OK id=10HmbE-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbF-0005vi-00
+250 OK id=10HmbF-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbG-0005vi-00
+250 OK id=10HmbG-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbH-0005vi-00
+250 OK id=10HmbH-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbI-0005vi-00
+250 OK id=10HmbI-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbJ-0005vi-00
+250 OK id=10HmbJ-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test [56.56.57.57]
250 OK
250 accepted by condition
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbK-0005vi-00
+250 OK id=10HmbK-000000005vi-0000
250 OK
451 Temporary local problem - please try later
250 Reset OK
250 OK
250 accepted by condition
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbL-0005vi-00
+250 OK id=10HmbL-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test [56.56.56.56]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbM-0005vi-00
+250 OK id=10HmbM-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test [56.56.58.58]
@@ -508,7 +508,7 @@ 550 Administrative prohibition
550 Administrative prohibition
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbN-0005vi-00
+250 OK id=10HmbN-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test [56.56.59.59]
diff --git a/test/stdout/0024 b/test/stdout/0024 index f4d0a7a0b..1cfdfcac5 100644 --- a/test/stdout/0024 +++ b/test/stdout/0024 @@ -9,7 +9,7 @@ 550 Sender verify failed
550 Sender verify failed
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test [V4NET.0.0.0]
@@ -21,7 +21,7 @@ 550 relay not permitted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test [V4NET.255.255.0]
@@ -31,7 +31,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test [V4NET.11.12.13]
@@ -42,7 +42,7 @@ 550-rejected because V4NET.11.12.13 is in a black list at rbl.test.ex
550 This is a test blacklisting message
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test [V4NET.11.12.16]
@@ -51,7 +51,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test
diff --git a/test/stdout/0025 b/test/stdout/0025 index 61e1cb5f1..73dddc693 100644 --- a/test/stdout/0025 +++ b/test/stdout/0025 @@ -12,5 +12,5 @@ 550 Unrouteable address
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
diff --git a/test/stdout/0026 b/test/stdout/0026 index 5d6e14f64..170f9a5ba 100644 --- a/test/stdout/0026 +++ b/test/stdout/0026 @@ -3,7 +3,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbD-0005vi-00
+250 OK id=10HmbD-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test
@@ -38,7 +38,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbE-0005vi-00
+250 OK id=10HmbE-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test
@@ -52,7 +52,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbF-0005vi-00
+250 OK id=10HmbF-000000005vi-0000
221 myhost.test.ex closing connection
**** SMTP testing session as if from host 10.0.0.0 @@ -83,14 +83,14 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbG-0005vi-00
+250 OK id=10HmbG-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbH-0005vi-00
+250 OK id=10HmbH-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test
diff --git a/test/stdout/0033 b/test/stdout/0033 index 0ad42d527..c7fc5947b 100644 --- a/test/stdout/0033 +++ b/test/stdout/0033 @@ -17,10 +17,10 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for list@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -46,10 +46,10 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for list@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0034 b/test/stdout/0034 index 950806d8c..1d81aaf2d 100644 --- a/test/stdout/0034 +++ b/test/stdout/0034 @@ -32,22 +32,22 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
250 Reset OK
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
@@ -59,7 +59,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
250-myhost.test.ex Hello CALLER at a.b.c
250-SIZE 52428800
250-8BITMIME
@@ -68,7 +68,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbC-0005vi-00
+250 OK id=10HmbC-000000005vi-0000
250-myhost.test.ex Hello CALLER at a.b.c
250-SIZE 52428800
250-8BITMIME
@@ -77,7 +77,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbD-0005vi-00
+250 OK id=10HmbD-000000005vi-0000
250-myhost.test.ex Hello CALLER at a.b.c
250-SIZE 52428800
250-8BITMIME
diff --git a/test/stdout/0035 b/test/stdout/0035 index c2f2cf56f..10c80a0d7 100644 --- a/test/stdout/0035 +++ b/test/stdout/0035 @@ -23,7 +23,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 354 Enter message, ending with "." on a line by itself >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> mail from:<a@y> ??? 250 <<< 250 OK @@ -35,7 +35,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 354 Enter message, ending with "." on a line by itself >>> . ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> mail from:<> ??? 250 <<< 250 OK @@ -47,7 +47,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 354 Enter message, ending with "." on a line by itself >>> . ??? 250 -<<< 250 OK id=10HmaZ-0005vi-00 +<<< 250 OK id=10HmaZ-000000005vi-0000 >>> mail from:<notsubmit@y> ??? 250 <<< 250 OK @@ -60,7 +60,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> Sender: sender@some.where >>> . ??? 250 -<<< 250 OK id=10HmbA-0005vi-00 +<<< 250 OK id=10HmbA-000000005vi-0000 >>> mail from:<a@y> ??? 250 <<< 250 OK @@ -73,7 +73,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> Sender: sender@some.where >>> . ??? 250 -<<< 250 OK id=10HmbB-0005vi-00 +<<< 250 OK id=10HmbB-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection @@ -104,7 +104,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> Sender: sender@some.where >>> . ??? 250 -<<< 250 OK id=10HmbC-0005vi-00 +<<< 250 OK id=10HmbC-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection @@ -135,12 +135,12 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> Sender: sender@some.where >>> . ??? 250 -<<< 250 OK id=10HmbD-0005vi-00 +<<< 250 OK id=10HmbD-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection End of script -10HmaX-0005vi-00-H +10HmaX-000000005vi-0000-H EXIMUSER EXIM_UID EXIM_GID <notsubmit@y> ddddddddd 0 @@ -160,10 +160,10 @@ x@y dddP Received: from [127.0.0.1] (helo=rhu.barb) by myhost.test.ex with esmtp (Exim x.yz) (envelope-from <notsubmit@y>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -10HmaY-0005vi-00-H +10HmaY-000000005vi-0000-H EXIMUSER EXIM_UID EXIM_GID <a@y> ddddddddd 0 @@ -183,13 +183,13 @@ x@y dddP Received: from [127.0.0.1] (helo=rhu.barb) by myhost.test.ex with esmtp (Exim x.yz) (envelope-from <a@y>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> dddF From: a@y 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 -10HmaZ-0005vi-00-H +10HmaZ-000000005vi-0000-H EXIMUSER EXIM_UID EXIM_GID <> ddddddddd 0 @@ -208,12 +208,12 @@ x@y dddP Received: from [127.0.0.1] (helo=rhu.barb) by myhost.test.ex with esmtp (Exim x.yz) - id 10HmaZ-0005vi-00 + id 10HmaZ-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex> 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 -10HmbA-0005vi-00-H +10HmbA-000000005vi-0000-H EXIMUSER EXIM_UID EXIM_GID <notsubmit@y> ddddddddd 0 @@ -233,11 +233,11 @@ x@y dddP Received: from [127.0.0.1] (helo=rhu.barb) by myhost.test.ex with esmtp (Exim x.yz) (envelope-from <notsubmit@y>) - id 10HmbA-0005vi-00 + id 10HmbA-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 dddS Sender: sender@some.where -10HmbB-0005vi-00-H +10HmbB-000000005vi-0000-H EXIMUSER EXIM_UID EXIM_GID <a@y> ddddddddd 0 @@ -257,14 +257,14 @@ x@y dddP Received: from [127.0.0.1] (helo=rhu.barb) by myhost.test.ex with esmtp (Exim x.yz) (envelope-from <a@y>) - id 10HmbB-0005vi-00 + id 10HmbB-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 ddd* Sender: sender@some.where -047I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmbB-000000005vi-0000@myhost.test.ex> dddF From: a@y 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 -10HmbC-0005vi-00-H +10HmbC-000000005vi-0000-H EXIMUSER EXIM_UID EXIM_GID <a@y> ddddddddd 0 @@ -284,14 +284,14 @@ x@y dddP Received: from [127.0.0.1] (helo=rhu.barb) by myhost.test.ex with esmtp (Exim x.yz) (envelope-from <a@y>) - id 10HmbC-0005vi-00 + id 10HmbC-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 dddS Sender: sender@some.where -047I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmbC-000000005vi-0000@myhost.test.ex> dddF From: a@y 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 -10HmbD-0005vi-00-H +10HmbD-000000005vi-0000-H EXIMUSER EXIM_UID EXIM_GID <a@y> ddddddddd 0 @@ -311,10 +311,10 @@ x@y dddP Received: from [127.0.0.1] (helo=rhu.barb) by myhost.test.ex with esmtp (Exim x.yz) (envelope-from <a@y>) - id 10HmbD-0005vi-00 + id 10HmbD-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 ddd* Sender: sender@some.where -047I Message-Id: <E10HmbD-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmbD-000000005vi-0000@myhost.test.ex> dddF From: SomeName <a@y> 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0037 b/test/stdout/0037 index 6fa871d52..a1eea6563 100644 --- a/test/stdout/0037 +++ b/test/stdout/0037 @@ -211,7 +211,7 @@ Testing Exim filter file "TESTSUITE/aux-fixed/0037.f-5" Testprint: Before fail Fail text "This is a forced failure" Filtering ended by "fail". - 0m sss 10HmbA-0005vi-00 <CALLER@test.ex> *** frozen *** + 0m 373 10HmbA-000000005vi-0000 <CALLER@test.ex> *** frozen *** userx@test.ex +D system-filter +D userz@test.ex @@ -227,7 +227,7 @@ Testprint: body_linecount = 2 Testprint: message_body = This is the body of Testprint: message_body_end = ible in the filter. Logfile TESTSUITE/spool/log/mainlog -Logwrite "1999-03-02 09:44:33 10HmcG-0005vi-00 "message for filter test" first delivery\n" +Logwrite "1999-03-02 09:44:33 10HmcG-000000005vi-0000 "message for filter test" first delivery\n" Headers add "X-added: qualify_domain is test.ex" Headers remove "remove-this" Unseen deliver message to: userz@test.ex errors_to abcd@test.ex @@ -239,11 +239,11 @@ Recipient = CALLER@test.ex Testing Exim filter file "TESTSUITE/aux-var/0037.F" Testprint: ------------------------------------------------ -Testprint: Test-headers: first one\nFrom: x@y\nTest-headers: another one\nMore-test-headers : yet another one\nSubject: testing, testing\nMessage-Id: <E10HmcH-0005vi-00@the.local.host.name>\nDate: Tue, 2 Mar 1999 09:44:33 +0000 +Testprint: Test-headers: first one\nFrom: x@y\nTest-headers: another one\nMore-test-headers : yet another one\nSubject: testing, testing\nMessage-Id: <E10HmcH-000000005vi-0000@the.local.host.name>\nDate: Tue, 2 Mar 1999 09:44:33 +0000 Testprint: ------------------------------------------------ Headers remove "test-headers:more-test-headers" Headers add "added-header: this is added\nadded-header2: a second line" -Testprint: From: x@y\nSubject: testing, testing\nMessage-Id: <E10HmcH-0005vi-00@the.local.host.name>\nDate: Tue, 2 Mar 1999 09:44:33 +0000\nadded-header: this is added\nadded-header2: a second line +Testprint: From: x@y\nSubject: testing, testing\nMessage-Id: <E10HmcH-000000005vi-0000@the.local.host.name>\nDate: Tue, 2 Mar 1999 09:44:33 +0000\nadded-header: this is added\nadded-header2: a second line Testprint: ------------------------------------------------ Testprint: message_size = 122 Testprint: message_body_size = 0 @@ -251,7 +251,7 @@ Testprint: body_linecount = 0 Testprint: message_body = Testprint: message_body_end = Logfile TESTSUITE/spool/log/mainlog -Logwrite "1999-03-02 09:44:33 10HmcH-0005vi-00 "testing, testing" first delivery\n" +Logwrite "1999-03-02 09:44:33 10HmcH-000000005vi-0000 "testing, testing" first delivery\n" Headers add "X-added: qualify_domain is test.ex" Headers remove "remove-this" Unseen deliver message to: userz@test.ex errors_to abcd@test.ex diff --git a/test/stdout/0044 b/test/stdout/0044 index e7c1f1443..b32174a63 100644 --- a/test/stdout/0044 +++ b/test/stdout/0044 @@ -14,7 +14,7 @@ 550 host is listed in rbl.test.ex
550 host is listed in rbl.test.ex
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -33,7 +33,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0049 b/test/stdout/0049 index 30863f9cb..f5e42824d 100644 --- a/test/stdout/0049 +++ b/test/stdout/0049 @@ -3,12 +3,12 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
221 myhost.ex closing connection
220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbG-0005vi-00
+250 OK id=10HmbG-000000005vi-0000
221 myhost.ex closing connection
diff --git a/test/stdout/0050 b/test/stdout/0050 index dba1bfe7d..ca9bdbfa1 100644 --- a/test/stdout/0050 +++ b/test/stdout/0050 @@ -3,12 +3,12 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
221 myhost.ex closing connection
220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbH-0005vi-00
+250 OK id=10HmbH-000000005vi-0000
221 myhost.ex closing connection
diff --git a/test/stdout/0056 b/test/stdout/0056 index cc2c780c3..91eb69695 100644 --- a/test/stdout/0056 +++ b/test/stdout/0056 @@ -10,7 +10,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0057 b/test/stdout/0057 index 472e299ff..7e4b4ede7 100644 --- a/test/stdout/0057 +++ b/test/stdout/0057 @@ -10,7 +10,7 @@ 550 relay not permitted
550 relay not permitted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0058 b/test/stdout/0058 index 13f71dc34..d04c2746e 100644 --- a/test/stdout/0058 +++ b/test/stdout/0058 @@ -8,14 +8,14 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0059 b/test/stdout/0059 index c556ae77a..95ff50a51 100644 --- a/test/stdout/0059 +++ b/test/stdout/0059 @@ -9,7 +9,7 @@ 250 Accepted
550 relay not permitted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0060 b/test/stdout/0060 index 3a98b3a51..1a9b21ceb 100644 --- a/test/stdout/0060 +++ b/test/stdout/0060 @@ -9,7 +9,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -25,7 +25,7 @@ 250 Accepted
550 relay not permitted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -41,7 +41,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -57,7 +57,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -73,7 +73,7 @@ 250 Accepted
550 relay not permitted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -89,7 +89,7 @@ 250 Accepted
550 relay not permitted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbC-0005vi-00
+250 OK id=10HmbC-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -105,7 +105,7 @@ 250 Accepted
550 relay not permitted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbD-0005vi-00
+250 OK id=10HmbD-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -121,7 +121,7 @@ 250 Accepted
550 relay not permitted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbE-0005vi-00
+250 OK id=10HmbE-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0061 b/test/stdout/0061 index 22bda1326..ed2ecb695 100644 --- a/test/stdout/0061 +++ b/test/stdout/0061 @@ -9,7 +9,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -25,7 +25,7 @@ 250 Accepted
550 relay not permitted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0062 b/test/stdout/0062 index 69ffa5d02..ed1b77279 100644 --- a/test/stdout/0062 +++ b/test/stdout/0062 @@ -9,7 +9,7 @@ 250 Accepted
550 relay not permitted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -25,7 +25,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -41,7 +41,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0063 b/test/stdout/0063 index 06e75e01c..97ee621a5 100644 --- a/test/stdout/0063 +++ b/test/stdout/0063 @@ -9,7 +9,7 @@ 250 Accepted
550 relay not permitted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -25,7 +25,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0064 b/test/stdout/0064 index 06e75e01c..97ee621a5 100644 --- a/test/stdout/0064 +++ b/test/stdout/0064 @@ -9,7 +9,7 @@ 250 Accepted
550 relay not permitted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -25,7 +25,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0065 b/test/stdout/0065 index c3cec016f..3264bfaf4 100644 --- a/test/stdout/0065 +++ b/test/stdout/0065 @@ -9,7 +9,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -25,7 +25,7 @@ 250 Accepted
550 relay not permitted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -41,7 +41,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -57,7 +57,7 @@ 250 Accepted
550 relay not permitted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -73,7 +73,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -89,7 +89,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbC-0005vi-00
+250 OK id=10HmbC-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -105,7 +105,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbD-0005vi-00
+250 OK id=10HmbD-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0066 b/test/stdout/0066 index 527308ee9..b0844ff3a 100644 --- a/test/stdout/0066 +++ b/test/stdout/0066 @@ -9,7 +9,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -25,7 +25,7 @@ 250 Accepted
550 relay not permitted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -41,7 +41,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -57,7 +57,7 @@ 250 Accepted
550 relay not permitted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -73,7 +73,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -89,7 +89,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbC-0005vi-00
+250 OK id=10HmbC-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -105,7 +105,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbD-0005vi-00
+250 OK id=10HmbD-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -121,7 +121,7 @@ 250 Accepted
550 relay not permitted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbE-0005vi-00
+250 OK id=10HmbE-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -137,7 +137,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbF-0005vi-00
+250 OK id=10HmbF-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0079 b/test/stdout/0079 index 5d0ea1853..9a8b41ef6 100644 --- a/test/stdout/0079 +++ b/test/stdout/0079 @@ -13,7 +13,7 @@ 250 Accepted
550 host is listed in rbl2.test.ex
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -27,7 +27,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at exim.test.ex [V4NET.11.12.14]
@@ -39,12 +39,12 @@ 250 Accepted
550 host is listed in rbl2.test.ex
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 the.local.host.name closing connection
diff --git a/test/stdout/0080 b/test/stdout/0080 index 65625dd3e..afb1bfdf0 100644 --- a/test/stdout/0080 +++ b/test/stdout/0080 @@ -13,7 +13,7 @@ 250 Accepted
550 host is listed in rbl.test.ex
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0086 b/test/stdout/0086 index ac05e2ad0..0f7169b0e 100644 --- a/test/stdout/0086 +++ b/test/stdout/0086 @@ -68,7 +68,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0087 b/test/stdout/0087 index 4893f48c2..955e50c4e 100644 --- a/test/stdout/0087 +++ b/test/stdout/0087 @@ -8,7 +8,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -23,7 +23,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -50,7 +50,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0091 b/test/stdout/0091 index 27abdbb8c..5b6ea6015 100644 --- a/test/stdout/0091 +++ b/test/stdout/0091 @@ -48,7 +48,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0093 b/test/stdout/0093 index 4762c64ac..dd0b3d2a7 100644 --- a/test/stdout/0093 +++ b/test/stdout/0093 @@ -27,11 +27,11 @@ Testing Exim filter file "TESTSUITE/aux-fixed/0093.f-3" Testprint: From: is defined Testprint: Absent: is not defined Testprint: ---------------------- -Testprint: From: a@b\nReply-to: x@y\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nMessage-Id: <E10HmaX-0005vi-00@the.local.host.name>\nSender: CALLER_NAME <CALLER@test.ex>\nDate: Tue, 2 Mar 1999 09:44:33 +0000 +Testprint: From: a@b\nReply-to: x@y\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nMessage-Id: <E10HmaX-000000005vi-0000@the.local.host.name>\nSender: CALLER_NAME <CALLER@test.ex>\nDate: Tue, 2 Mar 1999 09:44:33 +0000 Testprint: ---------------------- -Testprint: From: a@b\nReply-to: x@y\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nMessage-Id: <E10HmaX-0005vi-00@the.local.host.name>\nSender: CALLER_NAME <CALLER@test.ex>\nDate: Tue, 2 Mar 1999 09:44:33 +0000+++more +Testprint: From: a@b\nReply-to: x@y\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nMessage-Id: <E10HmaX-000000005vi-0000@the.local.host.name>\nSender: CALLER_NAME <CALLER@test.ex>\nDate: Tue, 2 Mar 1999 09:44:33 +0000+++more Testprint: ---------------------- -Testprint: +++From: a@b\nReply-to: x@y\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nMessage-Id: <E10HmaX-0005vi-00@the.local.host.name>\nSender: CALLER_NAME <CALLER@test.ex>\nDate: Tue, 2 Mar 1999 09:44:33 +0000+++ +Testprint: +++From: a@b\nReply-to: x@y\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nRepeated: this header is repeated\n and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nMessage-Id: <E10HmaX-000000005vi-0000@the.local.host.name>\nSender: CALLER_NAME <CALLER@test.ex>\nDate: Tue, 2 Mar 1999 09:44:33 +0000+++ Testprint: ---------------------- Testprint: From: >a@b< Testprint: this header is repeated\n and continued\nthis header is repeated\n and continued\nthis header is repeated\n and continued diff --git a/test/stdout/0094 b/test/stdout/0094 index 0fc00a755..850cf1c97 100644 --- a/test/stdout/0094 +++ b/test/stdout/0094 @@ -23,7 +23,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
**** SMTP testing session as if from host V4NET.99.99.90 @@ -41,12 +41,12 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 the.local.host.name Hello root at test [V4NET.99.99.96]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 the.local.host.name closing connection
diff --git a/test/stdout/0098 b/test/stdout/0098 index c9e2fef6f..3dd144ffc 100644 --- a/test/stdout/0098 +++ b/test/stdout/0098 @@ -1,9 +1,9 @@ -Message 10HmaX-0005vi-00 has been removed -Message 10HmaZ-0005vi-00 has been removed -Message 10HmbB-0005vi-00 has been removed -Message 10HmbD-0005vi-00 has been removed -Message 10HmbI-0005vi-00 has been removed -Message 10HmbJ-0005vi-00 has been removed -Message 10HmbK-0005vi-00 has been removed -Message 10HmbL-0005vi-00 has been removed -Message 10HmbM-0005vi-00 has been removed +Message 10HmaX-000000005vi-0000 has been removed +Message 10HmaZ-000000005vi-0000 has been removed +Message 10HmbB-000000005vi-0000 has been removed +Message 10HmbD-000000005vi-0000 has been removed +Message 10HmbI-000000005vi-0000 has been removed +Message 10HmbJ-000000005vi-0000 has been removed +Message 10HmbK-000000005vi-0000 has been removed +Message 10HmbL-000000005vi-0000 has been removed +Message 10HmbM-000000005vi-0000 has been removed diff --git a/test/stdout/0100 b/test/stdout/0100 index 8eb236715..f6e0b687d 100644 --- a/test/stdout/0100 +++ b/test/stdout/0100 @@ -13,11 +13,11 @@ DATA 354 Send data Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmbD-0005vi-00 + id 10HmbD-000000005vi-0000 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 ..dotheader: This is perfectly legal -Message-Id: <E10HmbD-0005vi-00@the.local.host.name> +Message-Id: <E10HmbD-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -45,11 +45,11 @@ DATA X-Filtered: just checking Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmbM-0005vi-00 + id 10HmbM-000000005vi-0000 for userx@filtered.com; Tue, 2 Mar 1999 09:44:33 +0000 ..dotheader: This is perfectly legal -Message-Id: <E10HmbM-0005vi-00@the.local.host.name> +Message-Id: <E10HmbM-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0101 b/test/stdout/0101 index 7fef0f808..7efcf873b 100644 --- a/test/stdout/0101 +++ b/test/stdout/0101 @@ -13,11 +13,11 @@ DATA 354 Send data Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmbB-0005vi-00 + id 10HmbB-000000005vi-0000 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 ..dotheader: This is perfectly legal -Message-Id: <E10HmbB-0005vi-00@the.local.host.name> +Message-Id: <E10HmbB-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0127 b/test/stdout/0127 index 30863f9cb..f5e42824d 100644 --- a/test/stdout/0127 +++ b/test/stdout/0127 @@ -3,12 +3,12 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
221 myhost.ex closing connection
220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbG-0005vi-00
+250 OK id=10HmbG-000000005vi-0000
221 myhost.ex closing connection
diff --git a/test/stdout/0136 b/test/stdout/0136 index 3e4577eeb..21945cc44 100644 --- a/test/stdout/0136 +++ b/test/stdout/0136 @@ -4,7 +4,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 the.local.host.name Hello CALLER at test
@@ -12,5 +12,5 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
221 the.local.host.name closing connection
diff --git a/test/stdout/0138 b/test/stdout/0138 index 88b1b79e0..6520808c1 100644 --- a/test/stdout/0138 +++ b/test/stdout/0138 @@ -13,7 +13,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -32,7 +32,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0139 b/test/stdout/0139 index 12764953f..184c8ae04 100644 --- a/test/stdout/0139 +++ b/test/stdout/0139 @@ -8,7 +8,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -53,7 +53,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
**** SMTP testing session as if from host V4NET.11.12.15 diff --git a/test/stdout/0143 b/test/stdout/0143 index 91e464eb6..5a7723efa 100644 --- a/test/stdout/0143 +++ b/test/stdout/0143 @@ -15,10 +15,10 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0154 b/test/stdout/0154 index 272078b57..45a40fdb7 100644 --- a/test/stdout/0154 +++ b/test/stdout/0154 @@ -1,30 +1,30 @@ - 0m sss 10HmaX-0005vi-00 <CALLER@test.ex> + 0m 293 10HmaX-000000005vi-0000 <CALLER@test.ex> a@test.ex - 0m sss 10HmaY-0005vi-00 <CALLER@test.ex> + 0m 293 10HmaY-000000005vi-0000 <CALLER@test.ex> b@test.ex - 0m sss 10HmaZ-0005vi-00 <CALLER@test.ex> + 0m 293 10HmaZ-000000005vi-0000 <CALLER@test.ex> c@test.ex - 0m sss 10HmbA-0005vi-00 <CALLER@test.ex> + 0m 293 10HmbA-000000005vi-0000 <CALLER@test.ex> d@test.ex - 0m sss 10HmbB-0005vi-00 <CALLER@test.ex> + 0m 293 10HmbB-000000005vi-0000 <CALLER@test.ex> e@test.ex - 0m sss 10HmbC-0005vi-00 <CALLER@test.ex> + 0m 293 10HmbC-000000005vi-0000 <CALLER@test.ex> f@test.ex - 0m sss 10HmbD-0005vi-00 <CALLER@test.ex> + 0m 293 10HmbD-000000005vi-0000 <CALLER@test.ex> g@test.ex - 0m sss 10HmbE-0005vi-00 <CALLER@test.ex> + 0m 293 10HmbE-000000005vi-0000 <CALLER@test.ex> h@test.ex - 0m sss 10HmbF-0005vi-00 <CALLER@test.ex> + 0m 293 10HmbF-000000005vi-0000 <CALLER@test.ex> i@test.ex - 0m sss 10HmbG-0005vi-00 <CALLER@test.ex> + 0m 293 10HmbG-000000005vi-0000 <CALLER@test.ex> j@test.ex diff --git a/test/stdout/0155 b/test/stdout/0155 index 3ec38cf41..f2fb036d2 100644 --- a/test/stdout/0155 +++ b/test/stdout/0155 @@ -1,45 +1,45 @@ ### exim -bp - 0m sss 10HmaX-0005vi-00 <CALLER@test.ex> + 0m 293 10HmaX-000000005vi-0000 <CALLER@test.ex> a@test.ex - 0m sss 10HmaY-0005vi-00 <CALLER@test.ex> + 0m 293 10HmaY-000000005vi-0000 <CALLER@test.ex> b@test.ex - 0m sss 10HmaZ-0005vi-00 <CALLER@test.ex> + 0m 293 10HmaZ-000000005vi-0000 <CALLER@test.ex> c@test.ex - 0m sss 10HmbA-0005vi-00 <CALLER@test.ex> + 0m 293 10HmbA-000000005vi-0000 <CALLER@test.ex> d@test.ex - 0m sss 10HmbB-0005vi-00 <CALLER@test.ex> + 0m 293 10HmbB-000000005vi-0000 <CALLER@test.ex> e@test.ex - 0m sss 10HmbC-0005vi-00 <CALLER@test.ex> + 0m 293 10HmbC-000000005vi-0000 <CALLER@test.ex> f@test.ex - 0m sss 10HmbD-0005vi-00 <CALLER@test.ex> + 0m 293 10HmbD-000000005vi-0000 <CALLER@test.ex> g@test.ex - 0m sss 10HmbE-0005vi-00 <CALLER@test.ex> + 0m 293 10HmbE-000000005vi-0000 <CALLER@test.ex> h@test.ex - 0m sss 10HmbF-0005vi-00 <CALLER@test.ex> + 0m 293 10HmbF-000000005vi-0000 <CALLER@test.ex> i@test.ex - 0m sss 10HmbG-0005vi-00 <CALLER@test.ex> + 0m 293 10HmbG-000000005vi-0000 <CALLER@test.ex> j@test.ex ### exim -bpi -10HmaX-0005vi-00 -10HmaY-0005vi-00 -10HmaZ-0005vi-00 -10HmbA-0005vi-00 -10HmbB-0005vi-00 -10HmbC-0005vi-00 -10HmbD-0005vi-00 -10HmbE-0005vi-00 -10HmbF-0005vi-00 -10HmbG-0005vi-00 +10HmaX-000000005vi-0000 +10HmaY-000000005vi-0000 +10HmaZ-000000005vi-0000 +10HmbA-000000005vi-0000 +10HmbB-000000005vi-0000 +10HmbC-000000005vi-0000 +10HmbD-000000005vi-0000 +10HmbE-000000005vi-0000 +10HmbF-000000005vi-0000 +10HmbG-000000005vi-0000 ******** SERVER ******** ### exim -bp diff --git a/test/stdout/0159 b/test/stdout/0159 index fd6fc0bed..bbb2be429 100644 --- a/test/stdout/0159 +++ b/test/stdout/0159 @@ -26,7 +26,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected >>> EHLO [ip4.ip4.ip4.ip4] >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> ehlo [IPV4:ip4.ip4.ip4.ip4] ??? 250- <<< 250-myhost.test.ex Hello [IPV4:ip4.ip4.ip4.ip4] [ip4.ip4.ip4.ip4] @@ -52,7 +52,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected >>> EHLO [IPV4:ip4.ip4.ip4.ip4] >>> . ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> ehlo ip4.ip4.ip4.ip4 ??? 250- <<< 250-myhost.test.ex Hello ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] @@ -78,7 +78,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected >>> EHLO ip4.ip4.ip4.ip4 >>> . ??? 250 -<<< 250 OK id=10HmaZ-0005vi-00 +<<< 250 OK id=10HmaZ-000000005vi-0000 >>> ehlo [V4NET.1.2.3] ??? 250- <<< 250-myhost.test.ex Hello [V4NET.1.2.3] [ip4.ip4.ip4.ip4] @@ -104,7 +104,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected >>> EHLO [V4NET.1.2.3] >>> . ??? 250 -<<< 250 OK id=10HmbA-0005vi-00 +<<< 250 OK id=10HmbA-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection diff --git a/test/stdout/0163 b/test/stdout/0163 index fbbc60192..5757591f8 100644 --- a/test/stdout/0163 +++ b/test/stdout/0163 @@ -14,10 +14,10 @@ DATA 350 Send message Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0175 b/test/stdout/0175 index 1291e5d10..5839a5a3a 100644 --- a/test/stdout/0175 +++ b/test/stdout/0175 @@ -36,7 +36,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0176 b/test/stdout/0176 index 8250f6616..f5de0f2a6 100644 --- a/test/stdout/0176 +++ b/test/stdout/0176 @@ -1,2 +1,2 @@ -Message 10HmaX-0005vi-00 is now frozen -Message 10HmaX-0005vi-00 is no longer frozen +Message 10HmaX-000000005vi-0000 is now frozen +Message 10HmaX-000000005vi-0000 is no longer frozen diff --git a/test/stdout/0177 b/test/stdout/0177 index df53dd2af..f0eaf8553 100644 --- a/test/stdout/0177 +++ b/test/stdout/0177 @@ -1,8 +1,8 @@ - 0m sss 10HmbA-0005vi-00 <CALLER@test.ex> *** frozen *** + 0m 354 10HmbA-000000005vi-0000 <CALLER@test.ex> *** frozen *** userx@test.ex +D >usery:userx@test.ex - 0m sss 10HmbG-0005vi-00 <CALLER@test.ex> *** frozen *** + 0m 360 10HmbG-000000005vi-0000 <CALLER@test.ex> *** frozen *** userz@test.ex @@ -21,11 +21,11 @@ DATA 350 Send message Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmbG-0005vi-00 + id 10HmbG-000000005vi-0000 for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Subject: freeze this (3) -Message-Id: <E10HmbG-0005vi-00@the.local.host.name> +Message-Id: <E10HmbG-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0179 b/test/stdout/0179 index 79524d8fe..ca0bac86e 100644 --- a/test/stdout/0179 +++ b/test/stdout/0179 @@ -14,10 +14,10 @@ DATA 350 Send message Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -31,10 +31,10 @@ DATA 350 Send message Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for abcd@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0185 b/test/stdout/0185 index f0dc3d3b9..e2f3c402d 100644 --- a/test/stdout/0185 +++ b/test/stdout/0185 @@ -1,4 +1,4 @@ - 0m sss 10HmaX-0005vi-00 <CALLER@test.ex> *** frozen *** + 0m 350 10HmaX-000000005vi-0000 <CALLER@test.ex> *** frozen *** usery@test.ex @@ -17,11 +17,11 @@ DATA 350 Send message Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Subject: freeze this -Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0190 b/test/stdout/0190 index 1a5c1c22b..02bb8ca95 100644 --- a/test/stdout/0190 +++ b/test/stdout/0190 @@ -125,9 +125,9 @@ DATA 350 Send message Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -151,9 +151,9 @@ DATA 350 Send message Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -177,9 +177,9 @@ DATA 350 Send message Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -205,9 +205,9 @@ DATA 350 Send message Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaY-0005vi-00; + id 10HmaY-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -231,9 +231,9 @@ DATA 350 Send message Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaY-0005vi-00; + id 10HmaY-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -261,9 +261,9 @@ DATA 350 Send message Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaZ-0005vi-00; + id 10HmaZ-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaZ-0005vi-00@the.local.host.name> +Message-Id: <E10HmaZ-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0197 b/test/stdout/0197 index 1ebd902a3..e7d3d7fed 100644 --- a/test/stdout/0197 +++ b/test/stdout/0197 @@ -5,5 +5,5 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 the.local.host.name closing connection
diff --git a/test/stdout/0202 b/test/stdout/0202 index cb29f0f7c..5eb421d0c 100644 --- a/test/stdout/0202 +++ b/test/stdout/0202 @@ -3,12 +3,12 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 the.local.host.name closing connection
diff --git a/test/stdout/0203 b/test/stdout/0203 index 2a4048e1a..560fa21cc 100644 --- a/test/stdout/0203 +++ b/test/stdout/0203 @@ -14,10 +14,10 @@ DATA 354 More... Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0206 b/test/stdout/0206 index 5a1059de1..0e3e5a0ac 100644 --- a/test/stdout/0206 +++ b/test/stdout/0206 @@ -1 +1 @@ -Message 10HmaX-0005vi-00 is now frozen +Message 10HmaX-000000005vi-0000 is now frozen diff --git a/test/stdout/0207 b/test/stdout/0207 index 5a1059de1..0e3e5a0ac 100644 --- a/test/stdout/0207 +++ b/test/stdout/0207 @@ -1 +1 @@ -Message 10HmaX-0005vi-00 is now frozen +Message 10HmaX-000000005vi-0000 is now frozen diff --git a/test/stdout/0209 b/test/stdout/0209 index ebb3e5ae7..53c173ed8 100644 --- a/test/stdout/0209 +++ b/test/stdout/0209 @@ -1,5 +1,5 @@ -Message 10HmaX-0005vi-00 has been removed -Message 10HmaY-0005vi-00 has been removed +Message 10HmaX-000000005vi-0000 has been removed +Message 10HmaY-000000005vi-0000 has been removed ******** SERVER ******** Listening on port 1224 ... @@ -31,9 +31,9 @@ DATA 354 Go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaZ-0005vi-00; + id 10HmaZ-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaZ-0005vi-00@the.local.host.name> +Message-Id: <E10HmaZ-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0210 b/test/stdout/0210 index 30ad65754..af9552f24 100644 --- a/test/stdout/0210 +++ b/test/stdout/0210 @@ -13,9 +13,9 @@ RCPT TO:<smtp@test.ex> DATA 345 Send it Received: from CALLER by the.local.host.name with local (Exim x.yz) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0215 b/test/stdout/0215 index a883c1c02..3db6db88b 100644 --- a/test/stdout/0215 +++ b/test/stdout/0215 @@ -1,5 +1,5 @@ -Message 10HmaY-0005vi-00 has been removed -Message 10HmbA-0005vi-00 has been removed +Message 10HmaY-000000005vi-0000 has been removed +Message 10HmbA-000000005vi-0000 has been removed ******** SERVER ******** Listening on port 1224 ... @@ -16,10 +16,10 @@ DATA 354 Send it Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -53,9 +53,9 @@ DATA 354 Send it Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00; + id 10HmaY-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -94,9 +94,9 @@ DATA 354 Send it Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbA-0005vi-00; + id 10HmbA-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -142,9 +142,9 @@ DATA 354 Send it Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbC-0005vi-00; + id 10HmbC-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbC-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbC-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -176,9 +176,9 @@ DATA 354 Send it Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbE-0005vi-00; + id 10HmbE-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbE-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbE-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -209,9 +209,9 @@ DATA 354 Send it Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbF-0005vi-00; + id 10HmbF-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbF-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbF-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0217 b/test/stdout/0217 index ab2b72ac9..b2dd52f1a 100644 --- a/test/stdout/0217 +++ b/test/stdout/0217 @@ -20,9 +20,9 @@ DATA 351 Send more Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -608,9 +608,9 @@ DATA 351 Send more Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmbP-0005vi-00; + id 10HmbP-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbP-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbP-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -831,9 +831,9 @@ DATA 354 go Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmbQ-0005vi-00; + id 10HmbQ-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbQ-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbQ-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -947,9 +947,9 @@ DATA 354 go Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmbQ-0005vi-00; + id 10HmbQ-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbQ-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbQ-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -963,9 +963,9 @@ DATA 354 go Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmbQ-0005vi-00; + id 10HmbQ-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbQ-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbQ-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0218 b/test/stdout/0218 index f4680eda7..f6ef90486 100644 --- a/test/stdout/0218 +++ b/test/stdout/0218 @@ -14,10 +14,10 @@ DATA 351 Send more Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -32,10 +32,10 @@ DATA 351 Send more Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for b@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -82,10 +82,10 @@ DATA 351 OK Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmbC-0005vi-00 + id 10HmbC-000000005vi-0000 for c@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbC-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbC-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0220 b/test/stdout/0220 index 943864680..f5456cdf9 100644 --- a/test/stdout/0220 +++ b/test/stdout/0220 @@ -3,14 +3,14 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
221 myhost.test.ex closing connection
- 0m sss 10HmbC-0005vi-00 <> (CALLER) + 0m 280 10HmbC-000000005vi-0000 <> (CALLER) userx@myhost.test.ex - 0m sss 10HmbD-0005vi-00 <foo@bar> (CALLER) + 0m 337 10HmbD-000000005vi-0000 <foo@bar> (CALLER) userx@myhost.test.ex - 0m sss 10HmbE-0005vi-00 <> + 0m 242 10HmbE-000000005vi-0000 <> userx@myhost.test.ex diff --git a/test/stdout/0221 b/test/stdout/0221 index 26659dc89..723443dbc 100644 --- a/test/stdout/0221 +++ b/test/stdout/0221 @@ -3,14 +3,14 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
221 myhost.test.ex closing connection
- 0m sss 10HmbC-0005vi-00 <> (CALLER) + 0m 280 10HmbC-000000005vi-0000 <> (CALLER) userx@myhost.test.ex - 0m sss 10HmbD-0005vi-00 <CALLER@myhost.test.ex> + 0m 318 10HmbD-000000005vi-0000 <CALLER@myhost.test.ex> userx@myhost.test.ex - 0m sss 10HmbE-0005vi-00 <> + 0m 242 10HmbE-000000005vi-0000 <> userx@myhost.test.ex diff --git a/test/stdout/0230 b/test/stdout/0230 index 839ef8ee8..6d0654431 100644 --- a/test/stdout/0230 +++ b/test/stdout/0230 @@ -15,7 +15,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 354 Enter message, ending with "." on a line by itself >>> . ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection @@ -38,7 +38,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 354 Enter message, ending with "." on a line by itself >>> . ??? 250 -<<< 250 OK id=10HmaZ-0005vi-00 +<<< 250 OK id=10HmaZ-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection @@ -61,7 +61,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 354 Enter message, ending with "." on a line by itself >>> . ??? 250 -<<< 250 OK id=10HmbA-0005vi-00 +<<< 250 OK id=10HmbA-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection @@ -71,7 +71,7 @@ End of script 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
**** SMTP testing session as if from host 192.168.1.2 @@ -85,5 +85,5 @@ End of script 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
221 myhost.test.ex closing connection
diff --git a/test/stdout/0231 b/test/stdout/0231 index 5f889752c..92eb77e75 100644 --- a/test/stdout/0231 +++ b/test/stdout/0231 @@ -19,7 +19,7 @@ DATA 354 OK Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 From: a@test.ex, b@test.ex, a-rewrite@domain2, b-rewrite@domain2, a@domain3, b@domain3 @@ -27,7 +27,7 @@ To: a@test.ex, b@test.ex, a-other@domain2, b-other@domain2, a@domain3, b@domain3 Reply-to: a@test.ex, b@test.ex, a-other@domain2, b-other@domain2, a@domain3, b@domain3 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> Sender: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0233 b/test/stdout/0233 index 3f3bc4f8d..97fdce807 100644 --- a/test/stdout/0233 +++ b/test/stdout/0233 @@ -3,14 +3,14 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
250 OK
250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbD-0005vi-00
+250 OK id=10HmbD-000000005vi-0000
221 myhost.test.ex closing connection
diff --git a/test/stdout/0241 b/test/stdout/0241 index dc606c63c..4bd6a5344 100644 --- a/test/stdout/0241 +++ b/test/stdout/0241 @@ -1 +1 @@ -Message 10HmaX-0005vi-00 is no longer frozen +Message 10HmaX-000000005vi-0000 is no longer frozen diff --git a/test/stdout/0242 b/test/stdout/0242 index 753889433..dea10158d 100644 --- a/test/stdout/0242 +++ b/test/stdout/0242 @@ -13,10 +13,10 @@ DATA 354 Send more Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for abc@x.y.z; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -39,11 +39,11 @@ DATA 354 Send more Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for abc@x.y.z; Tue, 2 Mar 1999 09:44:33 +0000 Subject: Test message -Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0245 b/test/stdout/0245 index f3b1a3948..b34ec1aa3 100644 --- a/test/stdout/0245 +++ b/test/stdout/0245 @@ -1,9 +1,9 @@ - 0m sss 10HmaX-0005vi-00 <CALLER@myhost.test.ex> + 0m 334 10HmaX-000000005vi-0000 <CALLER@myhost.test.ex> "abc def"@test.ex xxx@yyy aaa@bbb -10HmaX-0005vi-00-H +10HmaX-000000005vi-0000-H CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 @@ -27,11 +27,11 @@ aaa@bbb dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 036T To: <"abc def"@test.ex>, xxx@yyy ddd* Bcc: aaa@bbb -047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> dddF From: CALLER_NAME <CALLER@myhost.test.ex> 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0250 b/test/stdout/0250 index c4332818e..99f9e377e 100644 --- a/test/stdout/0250 +++ b/test/stdout/0250 @@ -1,4 +1,4 @@ -10HmaX-0005vi-00-H +10HmaX-000000005vi-0000-H CALLER UID GID <CALLER-rewritten@test.ex> ddddddddd 0 @@ -20,18 +20,18 @@ SomeOne-rewritten@test.ex dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER-rewritten@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for SomeOne-rewritten@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 ddd* From: userx@test.ex dddF From: userx-rewritten@test.ex -047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> ddd* X-rewrote-original-recipient: SomeOne@test.ex ddd* Sender: CALLER_NAME <CALLER@test.ex> dddS Sender: CALLER_NAME <CALLER-rewritten@test.ex> ddd* X-rewrote-sender: CALLER@test.ex 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 -10HmaY-0005vi-00-H +10HmaY-000000005vi-0000-H CALLER UID GID <CALLER-rewritten@test.ex> ddddddddd 0 @@ -53,18 +53,18 @@ OtherOne-rewritten@test.ex dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER-rewritten@test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for OtherOne-rewritten@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 ddd* From: usery@test.ex dddF From: usery-rewritten@test.ex -047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> ddd* X-rewrote-original-recipient: OtherOne@test.ex ddd* Sender: CALLER_NAME <CALLER@test.ex> dddS Sender: CALLER_NAME <CALLER-rewritten@test.ex> ddd* X-rewrote-sender: CALLER@test.ex 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 -10HmaZ-0005vi-00-H +10HmaZ-000000005vi-0000-H CALLER UID GID <CALLER-rewritten@test.ex> ddddddddd 0 @@ -86,10 +86,10 @@ ThirdOne-rewritten@test.ex dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER-rewritten@test.ex>) - id 10HmaZ-0005vi-00 + id 10HmaZ-000000005vi-0000 for ThirdOne-rewritten@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex> ddd* X-rewrote-original-recipient: ThirdOne@test.ex ddd* From: CALLER_NAME <CALLER@test.ex> dddF From: CALLER_NAME <CALLER-rewritten@test.ex> diff --git a/test/stdout/0253 b/test/stdout/0253 index b0544c8d8..da5112366 100644 --- a/test/stdout/0253 +++ b/test/stdout/0253 @@ -15,9 +15,9 @@ DATA 354 Go ahead Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <pqr@x.y.z>) - 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: pqr@x.y.z Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -42,9 +42,9 @@ DATA 354 Go ahead Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <pqr@x.y.z>) - 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: pqr@x.y.z Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0254 b/test/stdout/0254 index 3897ce385..612d29b17 100644 --- a/test/stdout/0254 +++ b/test/stdout/0254 @@ -1,4 +1,4 @@ -10HmaX-0005vi-00-H +10HmaX-000000005vi-0000-H CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 @@ -20,10 +20,10 @@ userx@myhost.test.ex dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -054I Resent-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +061I Resent-Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> ddd* From: f dddF From: f@myhost.test.ex ddd* To: t @@ -37,7 +37,7 @@ ddd* Resent-To: t 015 Resent-Date: d 033 Resent-Subject: should not exist dddS Resent-Sender: CALLER_NAME <CALLER@myhost.test.ex> -10HmaY-0005vi-00-H +10HmaY-000000005vi-0000-H CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 @@ -59,17 +59,17 @@ userx@myhost.test.ex dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 045 Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000 -054I Resent-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +061I Resent-Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> ddd* From: f dddF From: f@myhost.test.ex ddd* Resent-From: f dddF Resent-From: f@myhost.test.ex dddS Resent-Sender: CALLER_NAME <CALLER@myhost.test.ex> -10HmaZ-0005vi-00-H +10HmaZ-000000005vi-0000-H CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 @@ -91,11 +91,11 @@ userx@myhost.test.ex dddP 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 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 045 Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000 -054I Resent-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> +061I Resent-Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex> ddd* From: userx dddF From: userx@myhost.test.ex ddd* To: xx@yy diff --git a/test/stdout/0256 b/test/stdout/0256 index 6622e82d8..088b7784c 100644 --- a/test/stdout/0256 +++ b/test/stdout/0256 @@ -3,5 +3,5 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 myhost.test.ex closing connection
diff --git a/test/stdout/0258 b/test/stdout/0258 index 6a4b42b1b..73f392f0e 100644 --- a/test/stdout/0258 +++ b/test/stdout/0258 @@ -3,12 +3,12 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbF-0005vi-00
+250 OK id=10HmbF-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbG-0005vi-00
+250 OK id=10HmbG-000000005vi-0000
221 myhost.test.ex closing connection
diff --git a/test/stdout/0264 b/test/stdout/0264 index 4fbb7da87..159ebfabb 100644 --- a/test/stdout/0264 +++ b/test/stdout/0264 @@ -6,18 +6,18 @@ first failed = time last try = time2 next try = time2 + 600 first failed = time last try = time2 next try = time2 + 1200 T:userx@test.ex -22 xxxx mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/userx) first failed = time last try = time2 next try = time2 + 600 -Message 10HmaX-0005vi-00 has been removed -Message 10HmbA-0005vi-00 has been removed -Message 10HmbB-0005vi-00 has been removed -Message 10HmbC-0005vi-00 has been removed -Message 10HmbD-0005vi-00 has been removed -Message 10HmbE-0005vi-00 has been removed +Message 10HmaX-000000005vi-0000 has been removed +Message 10HmbA-000000005vi-0000 has been removed +Message 10HmbB-000000005vi-0000 has been removed +Message 10HmbC-000000005vi-0000 has been removed +Message 10HmbD-000000005vi-0000 has been removed +Message 10HmbE-000000005vi-0000 has been removed +++++++++++++++++++++++++++ R:r4.a@outside -1 0 not just now first failed = time last try = time2 next try = time2 + 300 -Message 10HmbF-0005vi-00 has been removed -Message 10HmbG-0005vi-00 has been removed -Message 10HmbH-0005vi-00 has been removed +Message 10HmbF-000000005vi-0000 has been removed +Message 10HmbG-000000005vi-0000 has been removed +Message 10HmbH-000000005vi-0000 has been removed +++++++++++++++++++++++++++ R:outside -1 0 not just now first failed = time last try = time2 next try = time2 + 300 diff --git a/test/stdout/0282 b/test/stdout/0282 index abb6172b5..60ed701be 100644 --- a/test/stdout/0282 +++ b/test/stdout/0282 @@ -24,7 +24,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> This is a test message. >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection @@ -55,7 +55,7 @@ Connecting to 127.0.0.1 port 1226 ... connected >>> This is a test message. >>> . ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection diff --git a/test/stdout/0285 b/test/stdout/0285 index de6245c6d..2d7cfa36d 100644 --- a/test/stdout/0285 +++ b/test/stdout/0285 @@ -16,9 +16,9 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -42,9 +42,9 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -69,9 +69,9 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@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@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -95,9 +95,9 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@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@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -122,9 +122,9 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@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@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -147,9 +147,9 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmbB-0005vi-00; + id 10HmbB-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbB-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -163,9 +163,9 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmbB-0005vi-00; + id 10HmbB-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbB-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0286 b/test/stdout/0286 index ea7e87ed9..56cb5125b 100644 --- a/test/stdout/0286 +++ b/test/stdout/0286 @@ -16,9 +16,9 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -47,9 +47,9 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -63,9 +63,9 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -98,9 +98,9 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@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@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -133,9 +133,9 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@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@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0288 b/test/stdout/0288 index d7a6e1800..f94c9a85f 100644 --- a/test/stdout/0288 +++ b/test/stdout/0288 @@ -15,9 +15,9 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -40,9 +40,9 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0293 b/test/stdout/0293 index 7890fdf4a..3c9922b17 100644 --- a/test/stdout/0293 +++ b/test/stdout/0293 @@ -3,11 +3,11 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
421 too many messages in this connection
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/0294 b/test/stdout/0294 index dbc511d3d..a8096dbd5 100644 --- a/test/stdout/0294 +++ b/test/stdout/0294 @@ -7,11 +7,11 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
250 OK
221 myhost.test.ex closing connection
diff --git a/test/stdout/0299 b/test/stdout/0299 index 20d32d789..2bb691c36 100644 --- a/test/stdout/0299 +++ b/test/stdout/0299 @@ -16,9 +16,9 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -32,9 +32,9 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0300 b/test/stdout/0300 index e01188818..0766a4900 100644 --- a/test/stdout/0300 +++ b/test/stdout/0300 @@ -33,7 +33,7 @@ Connecting to 127.0.0.1 port 1225 ... connected +++ 1 >>> rcpt to:<userx@test.ex>\r\ndata\r\nthe message\r\nsecond line ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 ??? 250 <<< 250 OK ??? 250 @@ -136,7 +136,7 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 354 <<< 354 Enter message, ending with "." on a line by itself ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection diff --git a/test/stdout/0301 b/test/stdout/0301 index 71f6af970..0d9b81a2d 100644 --- a/test/stdout/0301 +++ b/test/stdout/0301 @@ -42,7 +42,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> the message >>> .\r\nmail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 ??? 250 <<< 250 OK ??? 250 @@ -51,7 +51,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 354 Enter message, ending with "." on a line by itself >>> . ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection diff --git a/test/stdout/0302 b/test/stdout/0302 index 8667de1c0..02ac75dc2 100644 --- a/test/stdout/0302 +++ b/test/stdout/0302 @@ -1,4 +1,4 @@ - 0m sss 10HmaX-0005vi-00 <CALLER@myhost.test.ex> + 0m 302 10HmaX-000000005vi-0000 <CALLER@myhost.test.ex> D abcd@myhost.test.ex defer@myhost.test.ex diff --git a/test/stdout/0303 b/test/stdout/0303 index 7b9a23b91..f88fb299a 100644 --- a/test/stdout/0303 +++ b/test/stdout/0303 @@ -40,7 +40,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -59,7 +59,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0311 b/test/stdout/0311 index b77eaf013..8a4bc53dd 100644 --- a/test/stdout/0311 +++ b/test/stdout/0311 @@ -1,4 +1,4 @@ -10HmaX-0005vi-00-H +10HmaX-000000005vi-0000-H CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 @@ -20,16 +20,16 @@ xx@myhost.test.ex dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for xx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 ddd* return-path: x@y ddd* Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 ddd* envelope-to: p@q -047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> dddF From: CALLER_NAME <CALLER@myhost.test.ex> 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 -10HmaY-0005vi-00-H +10HmaY-000000005vi-0000-H CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 @@ -51,12 +51,12 @@ xx@myhost.test.ex dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for xx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 017 return-path: x@y ddd* Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000 ddd* envelope-to: p@q -047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> dddF From: CALLER_NAME <CALLER@myhost.test.ex> 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0317 b/test/stdout/0317 index b2a5231e5..abb4cb59e 100644 --- a/test/stdout/0317 +++ b/test/stdout/0317 @@ -1,9 +1,9 @@ - 0m sss 10HmaX-0005vi-00 <CALLER@test.ex> + 0m 294 10HmaX-000000005vi-0000 <CALLER@test.ex> x@y.z a@b.c p@q.r - 0m sss 10HmaY-0005vi-00 <CALLER@test.ex> + 0m 366 10HmaY-000000005vi-0000 <CALLER@test.ex> aa@bb.cc pp@qq.rr xx@yy.zz diff --git a/test/stdout/0332 b/test/stdout/0332 index 648b56e09..2c586c2a9 100644 --- a/test/stdout/0332 +++ b/test/stdout/0332 @@ -15,10 +15,10 @@ DATA 354 Go ahead Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for ok@no.delay; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -33,9 +33,9 @@ DATA 354 Go ahead Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaY-0005vi-00; + id 10HmaY-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0333 b/test/stdout/0333 index 648b56e09..2c586c2a9 100644 --- a/test/stdout/0333 +++ b/test/stdout/0333 @@ -15,10 +15,10 @@ DATA 354 Go ahead Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for ok@no.delay; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -33,9 +33,9 @@ DATA 354 Go ahead Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaY-0005vi-00; + id 10HmaY-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0338 b/test/stdout/0338 index 7be32298c..813c272b7 100644 --- a/test/stdout/0338 +++ b/test/stdout/0338 @@ -1,8 +1,8 @@ - 0m sss 10HmaX-0005vi-00 <CALLER@test.ex> + 0m 297 10HmaX-000000005vi-0000 <CALLER@test.ex> D userx@test.ex a1-userx@test.ex -10HmaX-0005vi-00-H +10HmaX-000000005vi-0000-H CALLER UID GID <CALLER@test.ex> ddddddddd 0 @@ -25,9 +25,9 @@ a1-userx@test.ex 0,0 postmaster@test.ex 18,0#3 dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> dddF From: CALLER_NAME <CALLER@test.ex> 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0360 b/test/stdout/0360 index 9ff9b176f..91810eb9b 100644 --- a/test/stdout/0360 +++ b/test/stdout/0360 @@ -1,4 +1,4 @@ - 0m sss 10HmaX-0005vi-00 <CALLER@test.ex> + 0m 295 10HmaX-000000005vi-0000 <CALLER@test.ex> cms@test.ex +D unknown@recurse.test.ex +D unknown@recurse.test.ex.test.ex diff --git a/test/stdout/0363 b/test/stdout/0363 index d7fefbfc1..3ce1f6e89 100644 --- a/test/stdout/0363 +++ b/test/stdout/0363 @@ -13,11 +13,11 @@ DATA 334 send more Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for Aa%Bb@Cc; Tue, 2 Mar 1999 09:44:33 +0000 To: aa%bb@cc -Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0367 b/test/stdout/0367 index 3a592d2cb..aa3af08c5 100644 --- a/test/stdout/0367 +++ b/test/stdout/0367 @@ -14,10 +14,10 @@ DATA 354 More... Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -32,10 +32,10 @@ DATA 354 More... Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmbA-0005vi-00 + id 10HmbA-000000005vi-0000 for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbA-0005vi-00@the.local.host.name> +Message-Id: <E10HmbA-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -50,10 +50,10 @@ DATA 354 More... Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaZ-0005vi-00 + id 10HmaZ-000000005vi-0000 for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaZ-0005vi-00@the.local.host.name> +Message-Id: <E10HmaZ-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -68,10 +68,10 @@ DATA 354 More... Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0371 b/test/stdout/0371 index b9248dcf1..75e1085a7 100644 --- a/test/stdout/0371 +++ b/test/stdout/0371 @@ -13,7 +13,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0372 b/test/stdout/0372 index 96688e568..76372708e 100644 --- a/test/stdout/0372 +++ b/test/stdout/0372 @@ -3,18 +3,18 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at host2.name [4.3.2.1]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
Connecting to 127.0.0.1 port 1225 ... connected ??? 220 @@ -33,6 +33,6 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 354 Enter message, ending with "." on a line by itself >>> . ??? 250 -<<< 250 OK id=10HmbA-0005vi-00 +<<< 250 OK id=10HmbA-000000005vi-0000 >>> QUIT End of script diff --git a/test/stdout/0374 b/test/stdout/0374 index 16089d23e..343906b16 100644 --- a/test/stdout/0374 +++ b/test/stdout/0374 @@ -13,9 +13,9 @@ DATA 334 send more Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0375 b/test/stdout/0375 index c8139f879..2708bee9e 100644 --- a/test/stdout/0375 +++ b/test/stdout/0375 @@ -13,9 +13,9 @@ DATA 334 send more Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -73,9 +73,9 @@ DATA 334 send more Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0376 b/test/stdout/0376 index 98a0177bf..87145f770 100644 --- a/test/stdout/0376 +++ b/test/stdout/0376 @@ -157,14 +157,14 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello root at test [V4NET.0.0.8]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello root at test [V4NET.0.0.9]
diff --git a/test/stdout/0377 b/test/stdout/0377 index e09e54925..0ecd47145 100644 --- a/test/stdout/0377 +++ b/test/stdout/0377 @@ -1,4 +1,4 @@ -10HmaX-0005vi-00-H +10HmaX-000000005vi-0000-H CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 @@ -23,8 +23,8 @@ cccc@myhost.test.ex dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> dddF From: CALLER_NAME <CALLER@myhost.test.ex> 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0378 b/test/stdout/0378 index 0f2367a24..988556e1e 100644 --- a/test/stdout/0378 +++ b/test/stdout/0378 @@ -1,4 +1,4 @@ -10HmaX-0005vi-00-H +10HmaX-000000005vi-0000-H CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 @@ -21,9 +21,9 @@ aaaa@myhost.test.ex dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for aaaa@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> dddF From: CALLER_NAME <CALLER@myhost.test.ex> 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0379 b/test/stdout/0379 index 7321f4e12..fdc96ae7f 100644 --- a/test/stdout/0379 +++ b/test/stdout/0379 @@ -1,4 +1,4 @@ -10HmaX-0005vi-00-H +10HmaX-000000005vi-0000-H CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 @@ -22,8 +22,8 @@ aaaa@myhost.test.ex dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> dddF From: CALLER_NAME <CALLER@myhost.test.ex> 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0386 b/test/stdout/0386 index 88c573afb..c914ae4c8 100644 --- a/test/stdout/0386 +++ b/test/stdout/0386 @@ -16,10 +16,10 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
diff --git a/test/stdout/0389 b/test/stdout/0389 index bbc87cfef..dabe1d368 100644 --- a/test/stdout/0389 +++ b/test/stdout/0389 @@ -3,9 +3,9 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
-10HmaX-0005vi-00-H +10HmaX-000000005vi-0000-H CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 @@ -30,9 +30,9 @@ x@y dddP Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> dddF From: CALLER_NAME <CALLER@myhost.test.ex> 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0395 b/test/stdout/0395 index 51a86f42f..77427ef12 100644 --- a/test/stdout/0395 +++ b/test/stdout/0395 @@ -22,12 +22,12 @@ rcpt to: userx 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbE-0005vi-00
+250 OK id=10HmbE-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbF-0005vi-00
+250 OK id=10HmbF-000000005vi-0000
221 the.local.host.name closing connection
diff --git a/test/stdout/0398 b/test/stdout/0398 index e6c41915f..d22d2e311 100644 --- a/test/stdout/0398 +++ b/test/stdout/0398 @@ -3,7 +3,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 mail.test.ex closing connection
220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 mail.test.ex Hello CALLER at test
diff --git a/test/stdout/0416 b/test/stdout/0416 index 0d359cbc7..39c381612 100644 --- a/test/stdout/0416 +++ b/test/stdout/0416 @@ -6,23 +6,23 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
250 OK
250 Accepted
250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbC-0005vi-00
+250 OK id=10HmbC-000000005vi-0000
221 mail.test.ex closing connection
diff --git a/test/stdout/0420 b/test/stdout/0420 index 1d78c1d2d..b9f7ba1a1 100644 --- a/test/stdout/0420 +++ b/test/stdout/0420 @@ -16,7 +16,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> Message. >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> mail from:<a@b> ??? 250 <<< 250 OK @@ -29,7 +29,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> Message. >>> . ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> quit ??? 221 <<< 221 mail.test.ex closing connection diff --git a/test/stdout/0431 b/test/stdout/0431 index b21aff290..9b2b21d91 100644 --- a/test/stdout/0431 +++ b/test/stdout/0431 @@ -15,9 +15,9 @@ DATA 354 Go ahead Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -41,9 +41,9 @@ DATA 354 Go ahead Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00; + id 10HmaY-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0440 b/test/stdout/0440 index 22057e92d..5a3fbed6c 100644 --- a/test/stdout/0440 +++ b/test/stdout/0440 @@ -13,10 +13,10 @@ DATA 354 OK Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for x1@y1; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -31,10 +31,10 @@ 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 for x3@y3; 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 @@ -49,10 +49,10 @@ DATA 354 OK Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for x2@y2; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0446 b/test/stdout/0446 index 3e01f186d..9b6ae5393 100644 --- a/test/stdout/0446 +++ b/test/stdout/0446 @@ -3,5 +3,5 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
diff --git a/test/stdout/0448 b/test/stdout/0448 index 0a42e0ea2..a915781bd 100644 --- a/test/stdout/0448 +++ b/test/stdout/0448 @@ -7,7 +7,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at x.y.z
@@ -18,5 +18,5 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 myhost.test.ex closing connection
diff --git a/test/stdout/0454 b/test/stdout/0454 index 46e4d29ca..f1106d184 100644 --- a/test/stdout/0454 +++ b/test/stdout/0454 @@ -16,7 +16,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> This is a test message. >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> QUIT ??? 221 <<< 221 myhost.test.ex closing connection diff --git a/test/stdout/0460 b/test/stdout/0460 index 1a3462b85..082635b97 100644 --- a/test/stdout/0460 +++ b/test/stdout/0460 @@ -29,7 +29,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> This is the message body. >>> . ??? 2 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> mail from:<userx@test.ex> ??? 250 <<< 250 OK @@ -47,7 +47,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> This is the message body. >>> . ??? 2 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> QUIT ??? 221 <<< 221 myhost.test.ex closing connection diff --git a/test/stdout/0461 b/test/stdout/0461 index b610cba0b..23d7fdc9c 100644 --- a/test/stdout/0461 +++ b/test/stdout/0461 @@ -13,10 +13,10 @@ DATA 354 OK Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -39,10 +39,10 @@ DATA 354 OK Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -65,10 +65,10 @@ DATA 354 OK Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaZ-0005vi-00 + id 10HmaZ-000000005vi-0000 for userx@test.ex; 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@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0465 b/test/stdout/0465 index a9ba3afdc..1a65979de 100644 --- a/test/stdout/0465 +++ b/test/stdout/0465 @@ -8,7 +8,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test
@@ -17,9 +17,9 @@ 354 Enter message, ending with "." on a line by itself
550 Administrative prohibition
221 myhost.test.ex closing connection
- 0m sss 10HmaY-0005vi-00 <> + 0m 265 10HmaY-000000005vi-0000 <> abc@domain - 0m sss 10HmaZ-0005vi-00 <abc@somewhere> + 0m 281 10HmaZ-000000005vi-0000 <abc@somewhere> xxx@yyy diff --git a/test/stdout/0467 b/test/stdout/0467 index c3891547d..5b35a366f 100644 --- a/test/stdout/0467 +++ b/test/stdout/0467 @@ -32,10 +32,10 @@ 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 for x@srv27.test.ex; 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 diff --git a/test/stdout/0474 b/test/stdout/0474 index 78f2f82e0..b4ae3cce2 100644 --- a/test/stdout/0474 +++ b/test/stdout/0474 @@ -1,8 +1,8 @@ +++++++++++++++++++++++++++ - T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 0 65 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 850 NONSENSE + T:127.0.0.1:127.0.0.1:1224:10HmaX-000000005vi-0000 0 65 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 850 NONSENSE first failed = time last try = time2 next try = time2 + 10 +++++++++++++++++++++++++++ - T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 0 65 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 850 RUBBISH + T:127.0.0.1:127.0.0.1:1224:10HmaX-000000005vi-0000 0 65 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 850 RUBBISH first failed = time last try = time2 next try = time2 + 10 +++++++++++++++++++++++++++ R:abcd@xyz:<CALLER@the.local.host.name> -44 12865 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<abcd@xyz>: 850 RUBBISH @@ -22,10 +22,10 @@ DATA 354 SEND IT Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for abcd@xyz; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0480 b/test/stdout/0480 index 603be0448..d4278b850 100644 --- a/test/stdout/0480 +++ b/test/stdout/0480 @@ -39,7 +39,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 354 Enter message, ending with "." on a line by itself >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> quit ??? 221 <<< 221 host.127.0.0.1 closing connection diff --git a/test/stdout/0485 b/test/stdout/0485 index 2fea10b6c..0d24cdb98 100644 --- a/test/stdout/0485 +++ b/test/stdout/0485 @@ -7,12 +7,12 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
250 OK
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
250 OK
221 myhost.test.ex closing connection
diff --git a/test/stdout/0486 b/test/stdout/0486 index e76858efb..9f3c452e3 100644 --- a/test/stdout/0486 +++ b/test/stdout/0486 @@ -8,9 +8,9 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
diff --git a/test/stdout/0487 b/test/stdout/0487 index c8452793b..e422660ee 100644 --- a/test/stdout/0487 +++ b/test/stdout/0487 @@ -7,5 +7,5 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
diff --git a/test/stdout/0488 b/test/stdout/0488 index 703afa585..16659743e 100644 --- a/test/stdout/0488 +++ b/test/stdout/0488 @@ -3,9 +3,9 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
-10HmaX-0005vi-00-H +10HmaX-000000005vi-0000-H CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 @@ -28,10 +28,10 @@ userx@test.ex dddP Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> dddF From: CALLER_NAME <CALLER@myhost.test.ex> 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 011 X-1: first diff --git a/test/stdout/0490 b/test/stdout/0490 index 3e2b0e0a4..603dfe6ea 100644 --- a/test/stdout/0490 +++ b/test/stdout/0490 @@ -7,9 +7,9 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
-10HmaY-0005vi-00-H +10HmaY-000000005vi-0000-H CALLER UID GID <CALLER@myhost.test.ex> ddddddddd 0 @@ -32,9 +32,9 @@ bb@test.ex dddP Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for bb@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> dddF From: CALLER_NAME <CALLER@myhost.test.ex> 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0495 b/test/stdout/0495 index d445ac032..5d453389a 100644 --- a/test/stdout/0495 +++ b/test/stdout/0495 @@ -8,7 +8,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbJ-0005vi-00
+250 OK id=10HmbJ-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at a.b
@@ -20,7 +20,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbK-0005vi-00
+250 OK id=10HmbK-000000005vi-0000
******** SERVER ******** Listening on port 1224 ... @@ -40,9 +40,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 +115,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 +143,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 diff --git a/test/stdout/0496 b/test/stdout/0496 index d2cfe99cc..428259fd7 100644 --- a/test/stdout/0496 +++ b/test/stdout/0496 @@ -3,5 +3,5 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
diff --git a/test/stdout/0497 b/test/stdout/0497 index 0cc6992da..ac02261ac 100644 --- a/test/stdout/0497 +++ b/test/stdout/0497 @@ -1,5 +1,5 @@ +++++++++++++++++++++++++++ - T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 -45 13377 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 452 temporary error + T:127.0.0.1:127.0.0.1:1224:10HmaX-000000005vi-0000 -45 13377 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 452 temporary error first failed = time last try = time2 next try = time2 + 0 * +++++++++++++++++++++++++++ R:userx@x.y:<CALLER@myhost.test.ex> -44 13377 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@x.y>: 452 temporary error @@ -59,10 +59,10 @@ DATA 352 GO AHEAD 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 for userx@x.y; 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 @@ -128,10 +128,10 @@ DATA 352 GO AHEAD Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbL-0005vi-00 + id 10HmbL-000000005vi-0000 for userx@x.y; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbL-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbL-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0498 b/test/stdout/0498 index bd4bdf9ea..727e2a2fb 100644 --- a/test/stdout/0498 +++ b/test/stdout/0498 @@ -1,5 +1,5 @@ +++++++++++++++++++++++++++ - T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 -45 12865 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 450 DELAY + T:127.0.0.1:127.0.0.1:1224:10HmaX-000000005vi-0000 -45 12865 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 450 DELAY first failed = time last try = time2 next try = time2 + 10 ******** SERVER ******** @@ -28,10 +28,10 @@ DATA 345 OK Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@x.y; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0500 b/test/stdout/0500 index bacc27a17..0eb1148eb 100644 --- a/test/stdout/0500 +++ b/test/stdout/0500 @@ -11,5 +11,5 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
diff --git a/test/stdout/0502 b/test/stdout/0502 index df6f28f9f..eeb79533f 100644 --- a/test/stdout/0502 +++ b/test/stdout/0502 @@ -4,7 +4,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
250 OK
250 Accepted
250 Reset OK
@@ -13,7 +13,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 Your message here
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
221 Your message here
diff --git a/test/stdout/0505 b/test/stdout/0505 index 67ed52910..0fd19bcfb 100644 --- a/test/stdout/0505 +++ b/test/stdout/0505 @@ -10,7 +10,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
451 Temporary local problem - please try later
diff --git a/test/stdout/0507 b/test/stdout/0507 index ac8c2e945..f37c94feb 100644 --- a/test/stdout/0507 +++ b/test/stdout/0507 @@ -3,7 +3,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test
@@ -25,7 +25,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test
@@ -42,5 +42,5 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbC-0005vi-00
+250 OK id=10HmbC-000000005vi-0000
221 myhost.test.ex closing connection
diff --git a/test/stdout/0514 b/test/stdout/0514 index 4e85fa66a..db13b7e1a 100644 --- a/test/stdout/0514 +++ b/test/stdout/0514 @@ -1,7 +1,7 @@ - 0m sss 10HmaX-0005vi-00 <"spaced user"@myhost.test.ex> + 0m 356 10HmaX-000000005vi-0000 <"spaced user"@myhost.test.ex> userx@myhost.test.ex -10HmaX-0005vi-00-H +10HmaX-000000005vi-0000-H CALLER UID GID <"spaced user"@myhost.test.ex> ddddddddd 0 @@ -23,9 +23,9 @@ userx@myhost.test.ex dddP Received: from "spaced user" by myhost.test.ex with local (Exim x.yz) (envelope-from <"spaced user"@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> dddF From: CALLER_NAME <"spaced user"@myhost.test.ex> 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0517 b/test/stdout/0517 index ec86b8677..775349d70 100644 --- a/test/stdout/0517 +++ b/test/stdout/0517 @@ -3,12 +3,12 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
diff --git a/test/stdout/0525 b/test/stdout/0525 index 969cf1147..c7d59b4c4 100644 --- a/test/stdout/0525 +++ b/test/stdout/0525 @@ -3,7 +3,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
******** SERVER ******** diff --git a/test/stdout/0530 b/test/stdout/0530 index fcfd7211f..230bbde0a 100644 --- a/test/stdout/0530 +++ b/test/stdout/0530 @@ -3,33 +3,33 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbH-0005vi-00
+250 OK id=10HmbH-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbJ-0005vi-00
+250 OK id=10HmbJ-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbL-0005vi-00
+250 OK id=10HmbL-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbN-0005vi-00
+250 OK id=10HmbN-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbP-0005vi-00
+250 OK id=10HmbP-000000005vi-0000
221 myhost.test.ex closing connection
diff --git a/test/stdout/0531 b/test/stdout/0531 index e4d0d9c2b..1cdb8920c 100644 --- a/test/stdout/0531 +++ b/test/stdout/0531 @@ -16,9 +16,9 @@ DATA 354 Send it Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -43,10 +43,10 @@ DATA 354 Send it 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 for userx@retry.test.ex; 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 @@ -70,10 +70,10 @@ DATA 354 Send it 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 for userx@retry.test.ex; 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 diff --git a/test/stdout/0532 b/test/stdout/0532 index c6d6c25a0..d42bf29c7 100644 --- a/test/stdout/0532 +++ b/test/stdout/0532 @@ -4,6 +4,6 @@ 250 Accepted
550 Administrative prohibition
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
451 Temporary local problem - please try later
diff --git a/test/stdout/0542 b/test/stdout/0542 index 1a262e6b4..49f153376 100644 --- a/test/stdout/0542 +++ b/test/stdout/0542 @@ -1,8 +1,8 @@ > from: Himself <himself@there.tld> > subject: The subject is not the object > message_body_size=71 -> message_id=10HmaX-0005vi-00 -> message_exim_id=10HmaX-0005vi-00 +> message_id=10HmaX-000000005vi-0000 +> message_exim_id=10HmaX-000000005vi-0000 > max_received_linelength=70 > recipients=userx@test.x, usery@test.ex > Defined macro 'TESTING_MACROS' @@ -14,13 +14,13 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
> from: Himself <himself@there.tld> > subject: The subject is not the object > message_body_size=76 -> message_id=10HmaY-0005vi-00 -> message_exim_id=10HmaY-0005vi-00 +> message_id=10HmaY-000000005vi-0000 +> message_exim_id=10HmaY-000000005vi-0000 > max_received_linelength=75 > recipients=userx@test.x, usery@test.ex > @@ -28,7 +28,7 @@ > to: First <first@test.ex>, Second <second@test.ex> > subject: The subject is moot > message_body_size=77 -> message_exim_id=10HmaZ-0005vi-00 +> message_exim_id=10HmaZ-000000005vi-0000 > message_linecount=6 > message_body_linecount=2 > max_received_linelength=50 @@ -36,7 +36,7 @@ > From: A Person <a.person@a.domain.tld> To: First <first@test.ex>, Second <second@test.ex> Subject: The subject is moot -Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 > > body -------------------- diff --git a/test/stdout/0543 b/test/stdout/0543 index 6c82e87d5..9a99cddf2 100644 --- a/test/stdout/0543 +++ b/test/stdout/0543 @@ -29,10 +29,10 @@ DATA 354 More... Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0551 b/test/stdout/0551 index b1b17c478..5fd559458 100644 --- a/test/stdout/0551 +++ b/test/stdout/0551 @@ -1,16 +1,16 @@ -1999-03-02 09:44:33 [1234] 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 [1235] 10HmaX-0005vi-00 => userx <userx@test.ex> R=r1 T=t1 -1999-03-02 09:44:33 [1235] 10HmaX-0005vi-00 => usery <usery@test.ex> R=r1 T=t1 -1999-03-02 09:44:33 [1235] 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 [1234] 10HmaX-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 [1235] 10HmaX-000000005vi-0000 => userx <userx@test.ex> R=r1 T=t1 +1999-03-02 09:44:33 [1235] 10HmaX-000000005vi-0000 => usery <usery@test.ex> R=r1 T=t1 +1999-03-02 09:44:33 [1235] 10HmaX-000000005vi-0000 Completed -1999-03-02 09:44:33 [1236] 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 [1237] 10HmaY-0005vi-00 => userx <userx@test.ex> R=r1 T=t1 QT=qqs -1999-03-02 09:44:33 [1237] 10HmaY-0005vi-00 => userz <userz@test.ex> R=r1 T=t1 QT=qqs -1999-03-02 09:44:33 [1237] 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 [1236] 10HmaY-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 [1237] 10HmaY-000000005vi-0000 => userx <userx@test.ex> R=r1 T=t1 QT=qqs +1999-03-02 09:44:33 [1237] 10HmaY-000000005vi-0000 => userz <userz@test.ex> R=r1 T=t1 QT=qqs +1999-03-02 09:44:33 [1237] 10HmaY-000000005vi-0000 Completed -2017-07-30 18:51:05.712 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss RT=q.qqqs -2017-07-30 18:51:05.712 10HmaZ-0005vi-00 => userx <userx@test.ex> R=r1 T=t1 QT=q.qqqs DT=q.qqqs -2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed QT=q.qqqs +2017-07-30 18:51:05.712 10HmaZ-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss RT=q.qqqs +2017-07-30 18:51:05.712 10HmaZ-000000005vi-0000 => userx <userx@test.ex> R=r1 T=t1 QT=q.qqqs DT=q.qqqs +2017-07-30 18:51:05.712 10HmaZ-000000005vi-0000 Completed QT=q.qqqs exigrep exit code = 0 diff --git a/test/stdout/0554 b/test/stdout/0554 index 540a50681..f7a4b4838 100644 --- a/test/stdout/0554 +++ b/test/stdout/0554 @@ -29,10 +29,10 @@ DATA 354 Go Ahead Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0560 b/test/stdout/0560 index 2423d1618..3a977593d 100644 --- a/test/stdout/0560 +++ b/test/stdout/0560 @@ -1,13 +1,13 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 From: Somebody <abcd@x.y.z> To: first@test.ex another@another.ex Subject: Testing -Mvc -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> Sender: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0561 b/test/stdout/0561 index f83fd5b80..13dff5c41 100644 --- a/test/stdout/0561 +++ b/test/stdout/0561 @@ -3,20 +3,20 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbD-0005vi-00
+250 OK id=10HmbD-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbE-0005vi-00
+250 OK id=10HmbE-000000005vi-0000
221 myhost.test.ex closing connection
diff --git a/test/stdout/0564 b/test/stdout/0564 index 33492a729..ca19b523f 100644 --- a/test/stdout/0564 +++ b/test/stdout/0564 @@ -22,7 +22,7 @@ Connecting to 127.0.0.1 port <dynamic port> ... connected >>> This is a test message. >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> quit ??? 221 <<< 221 the.local.host.name closing connection diff --git a/test/stdout/0565 b/test/stdout/0565 index bb366149e..cf552958d 100644 --- a/test/stdout/0565 +++ b/test/stdout/0565 @@ -3,14 +3,14 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
******** SERVER ******** @@ -29,13 +29,13 @@ DATA Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 From: postmaster@y To: x@y Subject: first test message -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> Sender: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -60,13 +60,13 @@ DATA Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for x@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 From: postmaster@y To: x@y Subject: second test message -Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> Sender: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0566 b/test/stdout/0566 index d3465d49e..c17e9e485 100644 --- a/test/stdout/0566 +++ b/test/stdout/0566 @@ -97,7 +97,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at Testing
@@ -108,7 +108,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at Testing
@@ -119,7 +119,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at Testing
diff --git a/test/stdout/0567 b/test/stdout/0567 index c6d6c25a0..d42bf29c7 100644 --- a/test/stdout/0567 +++ b/test/stdout/0567 @@ -4,6 +4,6 @@ 250 Accepted
550 Administrative prohibition
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
451 Temporary local problem - please try later
diff --git a/test/stdout/0569 b/test/stdout/0569 index d227953f2..99f4f2868 100644 --- a/test/stdout/0569 +++ b/test/stdout/0569 @@ -8,7 +8,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -59,7 +59,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -74,7 +74,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0575 b/test/stdout/0575 index 60c717471..0756478fc 100644 --- a/test/stdout/0575 +++ b/test/stdout/0575 @@ -8,7 +8,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0576 b/test/stdout/0576 index 48cc6fd71..5fb18e930 100644 --- a/test/stdout/0576 +++ b/test/stdout/0576 @@ -3,19 +3,19 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 the.local.host.name closing connection
### default q - 0m sss 10HmaX-0005vi-00 <CALLER@the.local.host.name> + 0m 348 10HmaX-000000005vi-0000 <CALLER@the.local.host.name> normal@test.ex ### alternate q - 0m sss 10HmaY-0005vi-00 <CALLER@the.local.host.name> + 0m 351 10HmaY-000000005vi-0000 <CALLER@the.local.host.name> alternate@test.ex 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
@@ -23,14 +23,14 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
221 the.local.host.name closing connection
### load messages 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
@@ -38,38 +38,38 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbC-0005vi-00
+250 OK id=10HmbC-000000005vi-0000
221 the.local.host.name closing connection
### default q - 0m sss 10HmbB-0005vi-00 <CALLER@the.local.host.name> + 0m 348 10HmbB-000000005vi-0000 <CALLER@the.local.host.name> normal@test.ex ### alternate q - 0m sss 10HmbC-0005vi-00 <CALLER@the.local.host.name> + 0m 351 10HmbC-000000005vi-0000 <CALLER@the.local.host.name> alternate@test.ex ### move msg from default to third q -Message 10HmbB-0005vi-00 +Message 10HmbB-000000005vi-0000 ### move msg from alternate q to third q -Message 10HmbC-0005vi-00 +Message 10HmbC-000000005vi-0000 ### third q - 0m sss 10HmbB-0005vi-00 <CALLER@the.local.host.name> + 0m 348 10HmbB-000000005vi-0000 <CALLER@the.local.host.name> normal@test.ex - 0m sss 10HmbC-0005vi-00 <CALLER@the.local.host.name> + 0m 351 10HmbC-000000005vi-0000 <CALLER@the.local.host.name> alternate@test.ex -Message 10HmbB-0005vi-00 Message 10HmbC-0005vi-00 +Message 10HmbB-000000005vi-0000 Message 10HmbC-000000005vi-0000 ### default q - 0m sss 10HmbB-0005vi-00 <CALLER@the.local.host.name> + 0m 348 10HmbB-000000005vi-0000 <CALLER@the.local.host.name> normal@test.ex - 0m sss 10HmbC-0005vi-00 <CALLER@the.local.host.name> + 0m 351 10HmbC-000000005vi-0000 <CALLER@the.local.host.name> alternate@test.ex ### alternate q diff --git a/test/stdout/0578 b/test/stdout/0578 index 42bc52d0b..4159e2788 100644 --- a/test/stdout/0578 +++ b/test/stdout/0578 @@ -157,14 +157,14 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello root at test [V4NET.0.0.8]
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello root at test [V4NET.0.0.9]
diff --git a/test/stdout/0579 b/test/stdout/0579 index 8a9f835de..062573ebd 100644 --- a/test/stdout/0579 +++ b/test/stdout/0579 @@ -26,7 +26,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> body >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> QUIT ??? 221 <<< 221 myhost.test.ex closing connection diff --git a/test/stdout/0580 b/test/stdout/0580 index d9e7b18a3..adae72752 100644 --- a/test/stdout/0580 +++ b/test/stdout/0580 @@ -3,7 +3,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test
@@ -11,7 +11,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test
@@ -19,7 +19,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test
@@ -27,7 +27,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello CALLER at test
@@ -35,7 +35,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
221 myhost.test.ex closing connection
******** SERVER ******** @@ -53,11 +53,11 @@ DATA Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Subject: test -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -95,10 +95,10 @@ DATA Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00; + id 10HmaY-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 Subject: test -Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -136,10 +136,10 @@ DATA Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (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 Subject: test -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 @@ -165,10 +165,10 @@ DATA Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbA-0005vi-00; + id 10HmbA-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 Subject: test -Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -192,10 +192,10 @@ DATA Received: from CALLER (helo=test) by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbB-0005vi-00; + id 10HmbB-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 Subject: test -Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbB-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0584 b/test/stdout/0584 index c18ad7383..e894a1824 100644 --- a/test/stdout/0584 +++ b/test/stdout/0584 @@ -8,7 +8,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -35,7 +35,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0585 b/test/stdout/0585 index d2d019135..d893f59e8 100644 --- a/test/stdout/0585 +++ b/test/stdout/0585 @@ -3,7 +3,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
221 myhost.test.ex closing connection
### Reject: no match 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
@@ -28,7 +28,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
221 myhost.test.ex closing connection
### Reject: To: & CC: combo, an env rcpt missing 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
@@ -47,7 +47,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbC-0005vi-00
+250 OK id=10HmbC-000000005vi-0000
221 myhost.test.ex closing connection
******** SERVER ******** diff --git a/test/stdout/0589 b/test/stdout/0589 index 994f04e2e..f5dbff5eb 100644 --- a/test/stdout/0589 +++ b/test/stdout/0589 @@ -18,7 +18,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> MAIL FROM:<CALLER@test.ex> ??? 250 <<< 250 OK @@ -33,7 +33,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa >>> . ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> QUIT ??? 221 <<< 221 the.local.host.name closing connection diff --git a/test/stdout/0593 b/test/stdout/0593 index cb29f0f7c..5eb421d0c 100644 --- a/test/stdout/0593 +++ b/test/stdout/0593 @@ -3,12 +3,12 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 the.local.host.name closing connection
diff --git a/test/stdout/0596 b/test/stdout/0596 index 77a833394..d9ce0da44 100644 --- a/test/stdout/0596 +++ b/test/stdout/0596 @@ -4,7 +4,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 the.local.host.name Hello CALLER at test
@@ -12,5 +12,5 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 the.local.host.name closing connection
diff --git a/test/stdout/0597 b/test/stdout/0597 index ee9dd950a..fa94c8d8e 100644 --- a/test/stdout/0597 +++ b/test/stdout/0597 @@ -16,7 +16,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> Subject: 1 >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> RSET ??? 250 <<< 250 Reset OK @@ -32,7 +32,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> Subject: 2 >>> . ??? 250 -<<< 250 OK id=10HmaZ-0005vi-00 +<<< 250 OK id=10HmaZ-000000005vi-0000 >>> QUIT End of script Connecting to 127.0.0.1 port 1225 ... connected @@ -53,7 +53,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> Subject: 1 >>> . ??? 250 -<<< 250 OK id=10HmbB-0005vi-00 +<<< 250 OK id=10HmbB-000000005vi-0000 >>> RSET ??? 250 <<< 250 Reset OK @@ -69,6 +69,6 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> Subject: 2 >>> . ??? 250 -<<< 250 OK id=10HmbD-0005vi-00 +<<< 250 OK id=10HmbD-000000005vi-0000 >>> QUIT End of script diff --git a/test/stdout/0599 b/test/stdout/0599 index c1737463c..3cfef827a 100644 --- a/test/stdout/0599 +++ b/test/stdout/0599 @@ -3,6 +3,6 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
received: message from exim diff --git a/test/stdout/0600 b/test/stdout/0600 index cb29f0f7c..5eb421d0c 100644 --- a/test/stdout/0600 +++ b/test/stdout/0600 @@ -3,12 +3,12 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 the.local.host.name Hello CALLER at test
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 the.local.host.name closing connection
diff --git a/test/stdout/0607 b/test/stdout/0607 index 155284758..fc558b62f 100644 --- a/test/stdout/0607 +++ b/test/stdout/0607 @@ -3,10 +3,10 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 the.local.host.name closing connection
diff --git a/test/stdout/0610 b/test/stdout/0610 index b0c31adbd..48ce1dee0 100644 --- a/test/stdout/0610 +++ b/test/stdout/0610 @@ -3,12 +3,12 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 the.local.host.name closing connection
+++++++++++++++++++++++++++ T:127.0.0.1:127.0.0.1:1225/127.0.0.1 0 65 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 Temporary local problem - please try later diff --git a/test/stdout/0611 b/test/stdout/0611 index 11867c03a..49e48d4cf 100644 --- a/test/stdout/0611 +++ b/test/stdout/0611 @@ -24,7 +24,7 @@ Display options: -R Reverse order -a All recipients (including delivered) exiqgrep exit code = 0 - 0m sss 10HmaX-0005vi-00 <CALLER@test.ex> + 0m 278 10HmaX-000000005vi-0000 <CALLER@test.ex> a@test.ex b@test.ex c@test.ex diff --git a/test/stdout/0612 b/test/stdout/0612 index 6bb2ca97f..74c73019b 100644 --- a/test/stdout/0612 +++ b/test/stdout/0612 @@ -36,7 +36,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected >>> Subject: test >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> QUIT ??? 221 <<< 221 myhost.test.ex closing connection @@ -65,7 +65,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected >>> Subject: test >>> . ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> QUIT ??? 221 <<< 221 myhost.test.ex closing connection @@ -94,7 +94,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected >>> Subject: test >>> . ??? 250 -<<< 250 OK id=10HmbB-0005vi-00 +<<< 250 OK id=10HmbB-000000005vi-0000 >>> QUIT ??? 221 <<< 221 myhost.test.ex closing connection @@ -123,13 +123,13 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected >>> Subject: test >>> . ??? 250 -<<< 250 OK id=10HmbC-0005vi-00 +<<< 250 OK id=10HmbC-000000005vi-0000 >>> QUIT ??? 221 <<< 221 myhost.test.ex closing connection End of script -Message 10HmbB-0005vi-00 has been removed -Message 10HmbC-0005vi-00 has been removed +Message 10HmbB-000000005vi-0000 has been removed +Message 10HmbC-000000005vi-0000 has been removed Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected ??? 220 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 @@ -154,7 +154,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected >>> Subject: test >>> . ??? 250 -<<< 250 OK id=10HmbE-0005vi-00 +<<< 250 OK id=10HmbE-000000005vi-0000 >>> QUIT ??? 221 <<< 221 myhost.test.ex closing connection diff --git a/test/stdout/0614 b/test/stdout/0614 index e9cae83a4..17e273137 100644 --- a/test/stdout/0614 +++ b/test/stdout/0614 @@ -3,30 +3,30 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbC-0005vi-00
+250 OK id=10HmbC-000000005vi-0000
221 the.local.host.name closing connection
diff --git a/test/stdout/0615 b/test/stdout/0615 index b0423fe2f..193856673 100644 --- a/test/stdout/0615 +++ b/test/stdout/0615 @@ -3,405 +3,405 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbC-0005vi-00
+250 OK id=10HmbC-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbD-0005vi-00
+250 OK id=10HmbD-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbE-0005vi-00
+250 OK id=10HmbE-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbF-0005vi-00
+250 OK id=10HmbF-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbG-0005vi-00
+250 OK id=10HmbG-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbH-0005vi-00
+250 OK id=10HmbH-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbI-0005vi-00
+250 OK id=10HmbI-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbJ-0005vi-00
+250 OK id=10HmbJ-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbK-0005vi-00
+250 OK id=10HmbK-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbL-0005vi-00
+250 OK id=10HmbL-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbM-0005vi-00
+250 OK id=10HmbM-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbN-0005vi-00
+250 OK id=10HmbN-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbO-0005vi-00
+250 OK id=10HmbO-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbP-0005vi-00
+250 OK id=10HmbP-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbQ-0005vi-00
+250 OK id=10HmbQ-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbR-0005vi-00
+250 OK id=10HmbR-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbS-0005vi-00
+250 OK id=10HmbS-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbT-0005vi-00
+250 OK id=10HmbT-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbU-0005vi-00
+250 OK id=10HmbU-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbV-0005vi-00
+250 OK id=10HmbV-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbW-0005vi-00
+250 OK id=10HmbW-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbX-0005vi-00
+250 OK id=10HmbX-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbY-0005vi-00
+250 OK id=10HmbY-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbZ-0005vi-00
+250 OK id=10HmbZ-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcA-0005vi-00
+250 OK id=10HmcA-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcB-0005vi-00
+250 OK id=10HmcB-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcC-0005vi-00
+250 OK id=10HmcC-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcD-0005vi-00
+250 OK id=10HmcD-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcE-0005vi-00
+250 OK id=10HmcE-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcF-0005vi-00
+250 OK id=10HmcF-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcG-0005vi-00
+250 OK id=10HmcG-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcH-0005vi-00
+250 OK id=10HmcH-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcI-0005vi-00
+250 OK id=10HmcI-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcJ-0005vi-00
+250 OK id=10HmcJ-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcK-0005vi-00
+250 OK id=10HmcK-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcL-0005vi-00
+250 OK id=10HmcL-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcM-0005vi-00
+250 OK id=10HmcM-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcN-0005vi-00
+250 OK id=10HmcN-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcO-0005vi-00
+250 OK id=10HmcO-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcP-0005vi-00
+250 OK id=10HmcP-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcQ-0005vi-00
+250 OK id=10HmcQ-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcR-0005vi-00
+250 OK id=10HmcR-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcS-0005vi-00
+250 OK id=10HmcS-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcT-0005vi-00
+250 OK id=10HmcT-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcU-0005vi-00
+250 OK id=10HmcU-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcV-0005vi-00
+250 OK id=10HmcV-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcW-0005vi-00
+250 OK id=10HmcW-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcX-0005vi-00
+250 OK id=10HmcX-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcY-0005vi-00
+250 OK id=10HmcY-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmcZ-0005vi-00
+250 OK id=10HmcZ-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdA-0005vi-00
+250 OK id=10HmdA-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdB-0005vi-00
+250 OK id=10HmdB-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdC-0005vi-00
+250 OK id=10HmdC-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdD-0005vi-00
+250 OK id=10HmdD-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdE-0005vi-00
+250 OK id=10HmdE-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdF-0005vi-00
+250 OK id=10HmdF-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdG-0005vi-00
+250 OK id=10HmdG-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdH-0005vi-00
+250 OK id=10HmdH-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdI-0005vi-00
+250 OK id=10HmdI-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdJ-0005vi-00
+250 OK id=10HmdJ-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdK-0005vi-00
+250 OK id=10HmdK-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdL-0005vi-00
+250 OK id=10HmdL-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdM-0005vi-00
+250 OK id=10HmdM-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdN-0005vi-00
+250 OK id=10HmdN-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdO-0005vi-00
+250 OK id=10HmdO-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdP-0005vi-00
+250 OK id=10HmdP-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdQ-0005vi-00
+250 OK id=10HmdQ-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdR-0005vi-00
+250 OK id=10HmdR-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdS-0005vi-00
+250 OK id=10HmdS-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdT-0005vi-00
+250 OK id=10HmdT-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdU-0005vi-00
+250 OK id=10HmdU-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdV-0005vi-00
+250 OK id=10HmdV-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdW-0005vi-00
+250 OK id=10HmdW-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdX-0005vi-00
+250 OK id=10HmdX-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdY-0005vi-00
+250 OK id=10HmdY-000000005vi-0000
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmdZ-0005vi-00
+250 OK id=10HmdZ-000000005vi-0000
221 the.local.host.name closing connection
diff --git a/test/stdout/0616 b/test/stdout/0616 index 2cc574f49..f18163d4f 100644 --- a/test/stdout/0616 +++ b/test/stdout/0616 @@ -16,10 +16,10 @@ DATA 354 More... Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0617 b/test/stdout/0617 index 2cc574f49..f18163d4f 100644 --- a/test/stdout/0617 +++ b/test/stdout/0617 @@ -16,10 +16,10 @@ DATA 354 More... Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0618 b/test/stdout/0618 index 27103d94f..bd560e385 100644 --- a/test/stdout/0618 +++ b/test/stdout/0618 @@ -8,7 +8,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -16,7 +16,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -38,7 +38,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 354 Enter message, ending with "." on a line by itself >>> . ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> RSET ??? 250 <<< 250 Reset OK @@ -53,7 +53,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 354 Enter message, ending with "." on a line by itself >>> . ??? 250 -<<< 250 OK id=10HmaZ-0005vi-00 +<<< 250 OK id=10HmaZ-000000005vi-0000 >>> QUIT End of script 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
@@ -61,5 +61,5 @@ End of script 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
diff --git a/test/stdout/0623 b/test/stdout/0623 index 4a156de07..83f7c5612 100644 --- a/test/stdout/0623 +++ b/test/stdout/0623 @@ -1,5 +1,5 @@ -Message 10HmaZ-0005vi-00 has been removed -Message 10HmbB-0005vi-00 has been removed +Message 10HmaZ-000000005vi-0000 has been removed +Message 10HmbB-000000005vi-0000 has been removed ******** SERVER ******** Listening on port 1225 ... @@ -17,10 +17,10 @@ DATA 300 go ahead Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for good@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -43,10 +43,10 @@ DATA 300 go ahead Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for nopipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -70,10 +70,10 @@ DATA 300 go ahead 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 for tempreject@test.ex; 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 @@ -98,10 +98,10 @@ DATA 300 go ahead Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbA-0005vi-00 + id 10HmbA-000000005vi-0000 for permreject@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -126,10 +126,10 @@ DATA 300 go ahead Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbB-0005vi-00 + id 10HmbB-000000005vi-0000 for permreject@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbB-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0628 b/test/stdout/0628 index 959095ee3..4821f0180 100644 --- a/test/stdout/0628 +++ b/test/stdout/0628 @@ -26,7 +26,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> body >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> QUIT ??? 221 <<< 221 myhost.test.ex closing connection @@ -59,7 +59,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> body >>> . ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> QUIT ??? 221 <<< 221 myhost.test.ex closing connection diff --git a/test/stdout/0630 b/test/stdout/0630 index 8aec05945..00618e6c8 100644 --- a/test/stdout/0630 +++ b/test/stdout/0630 @@ -23,7 +23,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 354 Enter message, ending with "." on a line by itself >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> QUIT ??? 221 <<< 221 myhost.test.ex closing connection diff --git a/test/stdout/0631 b/test/stdout/0631 index cc0d9bb43..b3f7e1dc6 100644 --- a/test/stdout/0631 +++ b/test/stdout/0631 @@ -23,7 +23,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 354 Enter message, ending with "." on a line by itself >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> QUIT ??? 221 <<< 221 myhost.test.ex closing connection diff --git a/test/stdout/0633 b/test/stdout/0633 index 69141be1d..f7969f84f 100644 --- a/test/stdout/0633 +++ b/test/stdout/0633 @@ -8,7 +8,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/0699 b/test/stdout/0699 new file mode 100644 index 000000000..296d7f70c --- /dev/null +++ b/test/stdout/0699 @@ -0,0 +1,11 @@ + 0m 396 10HmaX-000000005vi-0000 <CALLER@the.local.host.name> + nulldeliver@test.ex + +exim_id_update exit code = 0 + 0m 396 10HmaY-0005vi-00-H <CALLER@the.local.host.name> + nulldeliver@test.ex + +exim_id_update exit code = 0 +DDd 317 10HmaY-000000005vi-0000 <nobody@test.ex> + nulldeliver@test.ex + diff --git a/test/stdout/0700 b/test/stdout/0700 index 260a13279..5c0739f72 100644 --- a/test/stdout/0700 +++ b/test/stdout/0700 @@ -2,6 +2,8 @@ 2022-12-29 07:35:43.928000 GMT ### A Message ID as it appears in the exim log: 2023-01-08 06:36:04.082000 GMT +### New-format log message ID +2023-05-01 15:44:36.979706 BST ### Just the date part of the Message ID: ### The Epoch ... 1970-01-01 01:00:00.000000 BST @@ -20,36 +22,36 @@ ### Message IDs generated on a system, such as Mac or Cygwin, ### which has low-resolution Message-ID timestamps 1970-01-01 01:00:00.000000 BST -2038-12-24 05:45:36.295000 GMT +2038-12-24 05:45:35.999000 GMT ### An invalid base option ### Message IDs generated on a standard system ### with high-resolution Message-ID timestamps 1970-01-01 01:00:00.000000 BST -3002-09-30 13:51:46.102500 BST -3769-12-05 03:13:04.921500 GMT +3002-09-30 13:51:45.999500 BST +3769-12-05 03:13:03.999500 GMT ### Some strings that are similar to, but not Exim Message IDs: ### Print date with localtime 1970-01-01 01:00:00.000000 BST 2022-12-29 07:35:43.928000 GMT -3769-12-05 03:13:04.921500 GMT +3769-12-05 03:13:03.999500 GMT ### Print date with timezone GMT/Zulu 1970-01-01 00:00:00.000000 2022-12-29 07:35:43.928000 2022-12-29 07:35:43.928000 -3002-09-30 12:51:46.102500 +3002-09-30 12:51:45.999500 ### Print date as seconds since the UNIX epoch. 0.000000 -1672299344.734000 -56800235584.921500 +1672299343.999500 +56800235583.999500 ### Show the process id too -32590299106.102500 pid 874183 -3002-09-30 13:51:46.102500 BST pid 874183 -3002-09-30 13:51:46.102500 BST pid 874183 +32590299105.999500 pid 874183 +3002-09-30 13:51:45.999500 BST pid 874183 +3002-09-30 13:51:45.999500 BST pid 874183 ### Override the value of localhost_number set in the exim configuation file -3002-09-30 13:51:45.025000 BST -3002-09-30 13:51:45.025000 BST -2038-12-24 05:45:38.950000 GMT -3002-09-30 13:51:45.025000 BST +3002-09-30 13:51:45.995000 BST +3002-09-30 13:51:45.995000 BST +2038-12-24 05:45:35.360000 GMT +3002-09-30 13:51:45.995000 BST ### From here as 701 - 703 ### Each msg-id type, all zone 0.000000 pid 1319504 @@ -58,9 +60,9 @@ 0.000000 pid 1319504 1970-01-01 00:00:00.000000 pid 1319504 1970-01-01 01:00:00.000000 BST pid 1319504 -32590299106.921500 pid 1319504 -3002-09-30 12:51:46.921500 pid 1319504 -3002-09-30 13:51:46.921500 BST pid 1319504 +32590299105.999500 pid 1319504 +3002-09-30 12:51:45.999500 pid 1319504 +3002-09-30 13:51:45.999500 BST pid 1319504 1288014663.915000 pid 774213 2010-10-25 13:51:03.915000 pid 774213 2010-10-25 14:51:03.915000 BST pid 774213 @@ -83,18 +85,18 @@ 3002-09-30 12:51:45.000000 3002-09-30 13:51:45.000000 BST ### All msg-id types, all zones, localhost_number = 3 --3.000000 -1969-12-31 23:59:57.000000 -1970-01-01 00:59:57.000000 BST --3.000000 -1969-12-31 23:59:57.000000 -1970-01-01 00:59:57.000000 BST -32590299121.215000 -3002-09-30 12:52:01.215000 -3002-09-30 13:52:01.215000 BST -1288014669.150000 -2010-10-25 13:51:09.150000 -2010-10-25 14:51:09.150000 BST +0.000000 +1970-01-01 00:00:00.000000 +1970-01-01 01:00:00.000000 BST +0.000000 +1970-01-01 00:00:00.000000 +1970-01-01 01:00:00.000000 BST +32590299105.995000 +3002-09-30 12:51:45.995000 +3002-09-30 13:51:45.995000 BST +1288014663.150000 +2010-10-25 13:51:03.150000 +2010-10-25 14:51:03.150000 BST 0.000000 1970-01-01 00:00:00.000000 1970-01-01 01:00:00.000000 BST @@ -114,18 +116,18 @@ 3002-09-30 12:51:45.000000 3002-09-30 13:51:45.000000 BST ### All msg-id types, all zones, localhost_number = 13 --13.000000 -1969-12-31 23:59:47.000000 -1970-01-01 00:59:47.000000 BST --13.000000 -1969-12-31 23:59:47.000000 -1970-01-01 00:59:47.000000 BST -32590299111.215000 -3002-09-30 12:51:51.215000 -3002-09-30 13:51:51.215000 BST -1288014659.150000 -2010-10-25 13:50:59.150000 -2010-10-25 14:50:59.150000 BST +0.000000 +1970-01-01 00:00:00.000000 +1970-01-01 01:00:00.000000 BST +0.000000 +1970-01-01 00:00:00.000000 +1970-01-01 01:00:00.000000 BST +32590299105.995000 +3002-09-30 12:51:45.995000 +3002-09-30 13:51:45.995000 BST +1288014663.150000 +2010-10-25 13:51:03.150000 +2010-10-25 14:51:03.150000 BST 0.000000 1970-01-01 00:00:00.000000 1970-01-01 01:00:00.000000 BST @@ -152,6 +154,12 @@ 0.000000 1970-01-01 00:00:00.000000 1970-01-01 01:00:00.000000 BST +2176782335.972000 +2038-12-24 05:45:35.972000 +2038-12-24 05:45:35.972000 GMT +102953955.999000 +1973-04-06 14:19:15.999000 +1973-04-06 15:19:15.999000 BST 0.000000 1970-01-01 00:00:00.000000 1970-01-01 01:00:00.000000 BST @@ -174,9 +182,9 @@ 0.000000 1970-01-01 00:00:00.000000 1970-01-01 01:00:00.000000 BST -32590299106.921500 -3002-09-30 12:51:46.921500 -3002-09-30 13:51:46.921500 BST +32590299105.999500 +3002-09-30 12:51:45.999500 +3002-09-30 13:51:45.999500 BST 1288014663.915000 2010-10-25 13:51:03.915000 2010-10-25 14:51:03.915000 BST @@ -202,6 +210,7 @@ ******** SERVER ******** ### A Message ID as it appears in an email: ### A Message ID as it appears in the exim log: +### New-format log message ID ### Just the date part of the Message ID: ### The Epoch ... ### ... the script was under development at this time ... diff --git a/test/stdout/0701 b/test/stdout/0701 index 533cba4cc..405de59ba 100644 --- a/test/stdout/0701 +++ b/test/stdout/0701 @@ -1,16 +1,16 @@ ### Each msg-id type, all zone --3.000000 pid 1319504 -1969-12-31 23:59:57.000000 pid 1319504 -1970-01-01 00:59:57.000000 BST pid 1319504 --3.000000 pid 1319504 -1969-12-31 23:59:57.000000 pid 1319504 -1970-01-01 00:59:57.000000 BST pid 1319504 -32590299121.215000 pid 1319504 -3002-09-30 12:52:01.215000 pid 1319504 -3002-09-30 13:52:01.215000 BST pid 1319504 -1288014669.150000 pid 774213 -2010-10-25 13:51:09.150000 pid 774213 -2010-10-25 14:51:09.150000 BST pid 774213 +0.000000 pid 1319504 +1970-01-01 00:00:00.000000 pid 1319504 +1970-01-01 01:00:00.000000 BST pid 1319504 +0.000000 pid 1319504 +1970-01-01 00:00:00.000000 pid 1319504 +1970-01-01 01:00:00.000000 BST pid 1319504 +32590299105.215000 pid 1319504 +3002-09-30 12:51:45.215000 pid 1319504 +3002-09-30 13:51:45.215000 BST pid 1319504 +1288014663.150000 pid 774213 +2010-10-25 13:51:03.150000 pid 774213 +2010-10-25 14:51:03.150000 BST pid 774213 0.000000 1970-01-01 00:00:00.000000 1970-01-01 01:00:00.000000 BST @@ -30,18 +30,18 @@ 3002-09-30 12:51:45.000000 3002-09-30 13:51:45.000000 BST ### All msg-id types, all zones, localhost_number = 3 --3.000000 -1969-12-31 23:59:57.000000 -1970-01-01 00:59:57.000000 BST --3.000000 -1969-12-31 23:59:57.000000 -1970-01-01 00:59:57.000000 BST -32590299121.215000 -3002-09-30 12:52:01.215000 -3002-09-30 13:52:01.215000 BST -1288014669.150000 -2010-10-25 13:51:09.150000 -2010-10-25 14:51:09.150000 BST +0.000000 +1970-01-01 00:00:00.000000 +1970-01-01 01:00:00.000000 BST +0.000000 +1970-01-01 00:00:00.000000 +1970-01-01 01:00:00.000000 BST +32590299105.215000 +3002-09-30 12:51:45.215000 +3002-09-30 13:51:45.215000 BST +1288014663.150000 +2010-10-25 13:51:03.150000 +2010-10-25 14:51:03.150000 BST 0.000000 1970-01-01 00:00:00.000000 1970-01-01 01:00:00.000000 BST @@ -61,18 +61,18 @@ 3002-09-30 12:51:45.000000 3002-09-30 13:51:45.000000 BST ### All msg-id types, all zones, localhost_number = 13 --13.000000 -1969-12-31 23:59:47.000000 -1970-01-01 00:59:47.000000 BST --13.000000 -1969-12-31 23:59:47.000000 -1970-01-01 00:59:47.000000 BST -32590299111.215000 -3002-09-30 12:51:51.215000 -3002-09-30 13:51:51.215000 BST -1288014659.150000 -2010-10-25 13:50:59.150000 -2010-10-25 14:50:59.150000 BST +0.000000 +1970-01-01 00:00:00.000000 +1970-01-01 01:00:00.000000 BST +0.000000 +1970-01-01 00:00:00.000000 +1970-01-01 01:00:00.000000 BST +32590299105.215000 +3002-09-30 12:51:45.215000 +3002-09-30 13:51:45.215000 BST +1288014663.150000 +2010-10-25 13:51:03.150000 +2010-10-25 14:51:03.150000 BST 0.000000 1970-01-01 00:00:00.000000 1970-01-01 01:00:00.000000 BST @@ -93,12 +93,12 @@ 3002-09-30 13:51:45.000000 BST ### All msg-id types, all zones, localhost_number = 20 ### All msg-id types, all zones, base=36 --3.000000 -1969-12-31 23:59:57.000000 -1970-01-01 00:59:57.000000 BST --3.000000 -1969-12-31 23:59:57.000000 -1970-01-01 00:59:57.000000 BST +0.000000 +1970-01-01 00:00:00.000000 +1970-01-01 01:00:00.000000 BST +0.000000 +1970-01-01 00:00:00.000000 +1970-01-01 01:00:00.000000 BST 0.000000 1970-01-01 00:00:00.000000 1970-01-01 01:00:00.000000 BST @@ -115,18 +115,18 @@ 2038-12-24 05:45:35.000000 2038-12-24 05:45:35.000000 GMT ### All msg-id types, all zones, base=62 --3.000000 -1969-12-31 23:59:57.000000 -1970-01-01 00:59:57.000000 BST --3.000000 -1969-12-31 23:59:57.000000 -1970-01-01 00:59:57.000000 BST -32590299121.215000 -3002-09-30 12:52:01.215000 -3002-09-30 13:52:01.215000 BST -1288014669.150000 -2010-10-25 13:51:09.150000 -2010-10-25 14:51:09.150000 BST +0.000000 +1970-01-01 00:00:00.000000 +1970-01-01 01:00:00.000000 BST +0.000000 +1970-01-01 00:00:00.000000 +1970-01-01 01:00:00.000000 BST +32590299105.215000 +3002-09-30 12:51:45.215000 +3002-09-30 13:51:45.215000 BST +1288014663.150000 +2010-10-25 13:51:03.150000 +2010-10-25 14:51:03.150000 BST 0.000000 1970-01-01 00:00:00.000000 1970-01-01 01:00:00.000000 BST diff --git a/test/stdout/0702 b/test/stdout/0702 index c918ad633..95cd1583c 100644 --- a/test/stdout/0702 +++ b/test/stdout/0702 @@ -1,16 +1,16 @@ ### Each msg-id type, all zone --13.000000 pid 1319504 -1969-12-31 23:59:47.000000 pid 1319504 -1970-01-01 00:59:47.000000 BST pid 1319504 --13.000000 pid 1319504 -1969-12-31 23:59:47.000000 pid 1319504 -1970-01-01 00:59:47.000000 BST pid 1319504 -32590299111.215000 pid 1319504 -3002-09-30 12:51:51.215000 pid 1319504 -3002-09-30 13:51:51.215000 BST pid 1319504 -1288014659.150000 pid 774213 -2010-10-25 13:50:59.150000 pid 774213 -2010-10-25 14:50:59.150000 BST pid 774213 +0.000000 pid 1319504 +1970-01-01 00:00:00.000000 pid 1319504 +1970-01-01 01:00:00.000000 BST pid 1319504 +0.000000 pid 1319504 +1970-01-01 00:00:00.000000 pid 1319504 +1970-01-01 01:00:00.000000 BST pid 1319504 +32590299105.215000 pid 1319504 +3002-09-30 12:51:45.215000 pid 1319504 +3002-09-30 13:51:45.215000 BST pid 1319504 +1288014663.150000 pid 774213 +2010-10-25 13:51:03.150000 pid 774213 +2010-10-25 14:51:03.150000 BST pid 774213 0.000000 1970-01-01 00:00:00.000000 1970-01-01 01:00:00.000000 BST @@ -30,18 +30,18 @@ 3002-09-30 12:51:45.000000 3002-09-30 13:51:45.000000 BST ### All msg-id types, all zones, localhost_number = 3 --3.000000 -1969-12-31 23:59:57.000000 -1970-01-01 00:59:57.000000 BST --3.000000 -1969-12-31 23:59:57.000000 -1970-01-01 00:59:57.000000 BST -32590299121.215000 -3002-09-30 12:52:01.215000 -3002-09-30 13:52:01.215000 BST -1288014669.150000 -2010-10-25 13:51:09.150000 -2010-10-25 14:51:09.150000 BST +0.000000 +1970-01-01 00:00:00.000000 +1970-01-01 01:00:00.000000 BST +0.000000 +1970-01-01 00:00:00.000000 +1970-01-01 01:00:00.000000 BST +32590299105.215000 +3002-09-30 12:51:45.215000 +3002-09-30 13:51:45.215000 BST +1288014663.150000 +2010-10-25 13:51:03.150000 +2010-10-25 14:51:03.150000 BST 0.000000 1970-01-01 00:00:00.000000 1970-01-01 01:00:00.000000 BST @@ -61,18 +61,18 @@ 3002-09-30 12:51:45.000000 3002-09-30 13:51:45.000000 BST ### All msg-id types, all zones, localhost_number = 13 --13.000000 -1969-12-31 23:59:47.000000 -1970-01-01 00:59:47.000000 BST --13.000000 -1969-12-31 23:59:47.000000 -1970-01-01 00:59:47.000000 BST -32590299111.215000 -3002-09-30 12:51:51.215000 -3002-09-30 13:51:51.215000 BST -1288014659.150000 -2010-10-25 13:50:59.150000 -2010-10-25 14:50:59.150000 BST +0.000000 +1970-01-01 00:00:00.000000 +1970-01-01 01:00:00.000000 BST +0.000000 +1970-01-01 00:00:00.000000 +1970-01-01 01:00:00.000000 BST +32590299105.215000 +3002-09-30 12:51:45.215000 +3002-09-30 13:51:45.215000 BST +1288014663.150000 +2010-10-25 13:51:03.150000 +2010-10-25 14:51:03.150000 BST 0.000000 1970-01-01 00:00:00.000000 1970-01-01 01:00:00.000000 BST @@ -94,18 +94,18 @@ ### All msg-id types, all zones, localhost_number = 20 ### All msg-id types, all zones, base=36 ### All msg-id types, all zones, base=62 --13.000000 -1969-12-31 23:59:47.000000 -1970-01-01 00:59:47.000000 BST --13.000000 -1969-12-31 23:59:47.000000 -1970-01-01 00:59:47.000000 BST -32590299111.215000 -3002-09-30 12:51:51.215000 -3002-09-30 13:51:51.215000 BST -1288014659.150000 -2010-10-25 13:50:59.150000 -2010-10-25 14:50:59.150000 BST +0.000000 +1970-01-01 00:00:00.000000 +1970-01-01 01:00:00.000000 BST +0.000000 +1970-01-01 00:00:00.000000 +1970-01-01 01:00:00.000000 BST +32590299105.215000 +3002-09-30 12:51:45.215000 +3002-09-30 13:51:45.215000 BST +1288014663.150000 +2010-10-25 13:51:03.150000 +2010-10-25 14:51:03.150000 BST 0.000000 1970-01-01 00:00:00.000000 1970-01-01 01:00:00.000000 BST diff --git a/test/stdout/0703 b/test/stdout/0703 index 128415026..8c7d86c46 100644 --- a/test/stdout/0703 +++ b/test/stdout/0703 @@ -1,17 +1,17 @@ ### Each msg-id type, all zone ### All msg-id types, all zones, localhost_number = 3 --3.000000 -1969-12-31 23:59:57.000000 -1970-01-01 00:59:57.000000 BST --3.000000 -1969-12-31 23:59:57.000000 -1970-01-01 00:59:57.000000 BST -32590299121.215000 -3002-09-30 12:52:01.215000 -3002-09-30 13:52:01.215000 BST -1288014669.150000 -2010-10-25 13:51:09.150000 -2010-10-25 14:51:09.150000 BST +0.000000 +1970-01-01 00:00:00.000000 +1970-01-01 01:00:00.000000 BST +0.000000 +1970-01-01 00:00:00.000000 +1970-01-01 01:00:00.000000 BST +32590299105.215000 +3002-09-30 12:51:45.215000 +3002-09-30 13:51:45.215000 BST +1288014663.150000 +2010-10-25 13:51:03.150000 +2010-10-25 14:51:03.150000 BST 0.000000 1970-01-01 00:00:00.000000 1970-01-01 01:00:00.000000 BST @@ -31,18 +31,18 @@ 3002-09-30 12:51:45.000000 3002-09-30 13:51:45.000000 BST ### All msg-id types, all zones, localhost_number = 13 --13.000000 -1969-12-31 23:59:47.000000 -1970-01-01 00:59:47.000000 BST --13.000000 -1969-12-31 23:59:47.000000 -1970-01-01 00:59:47.000000 BST -32590299111.215000 -3002-09-30 12:51:51.215000 -3002-09-30 13:51:51.215000 BST -1288014659.150000 -2010-10-25 13:50:59.150000 -2010-10-25 14:50:59.150000 BST +0.000000 +1970-01-01 00:00:00.000000 +1970-01-01 01:00:00.000000 BST +0.000000 +1970-01-01 00:00:00.000000 +1970-01-01 01:00:00.000000 BST +32590299105.215000 +3002-09-30 12:51:45.215000 +3002-09-30 13:51:45.215000 BST +1288014663.150000 +2010-10-25 13:51:03.150000 +2010-10-25 14:51:03.150000 BST 0.000000 1970-01-01 00:00:00.000000 1970-01-01 01:00:00.000000 BST diff --git a/test/stdout/0900 b/test/stdout/0900 index 41e369735..fbebcf5f0 100644 --- a/test/stdout/0900 +++ b/test/stdout/0900 @@ -28,7 +28,7 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 250- <<< 250- 88 byte chunk, total 88 ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> quit ??? 221 <<< 221 testhost.test.ex closing connection @@ -70,7 +70,7 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 250- <<< 250- 0 byte chunk, total 100 ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> mail from:someone@some.domain ??? 250 <<< 250 OK @@ -88,7 +88,7 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 250- <<< 250- 78 byte chunk, total 88 ??? 250 -<<< 250 OK id=10HmaZ-0005vi-00 +<<< 250 OK id=10HmaZ-000000005vi-0000 >>> quit ??? 221 <<< 221 testhost.test.ex closing connection @@ -130,7 +130,7 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 250- <<< 250- 0 byte chunk, total 100 ??? 250 -<<< 250 OK id=10HmbA-0005vi-00 +<<< 250 OK id=10HmbA-000000005vi-0000 >>> RSET ??? 250 <<< 250 Reset OK @@ -151,7 +151,7 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 250- <<< 250- 78 byte chunk, total 88 ??? 250 -<<< 250 OK id=10HmbB-0005vi-00 +<<< 250 OK id=10HmbB-000000005vi-0000 >>> quit ??? 221 <<< 221 testhost.test.ex closing connection @@ -317,7 +317,7 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 250- <<< 250- 88 byte chunk, total 88 ??? 250 -<<< 250 OK id=10HmbD-0005vi-00 +<<< 250 OK id=10HmbD-000000005vi-0000 >>> quit ??? 221 <<< 221 testhost.test.ex closing connection @@ -454,7 +454,7 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 250- 6 byte chunk, total 93 <<< 250- 6 byte chunk, total 93 ??? 250 OK -<<< 250 OK id=10HmbE-0005vi-00 +<<< 250 OK id=10HmbE-000000005vi-0000 >>> QUIT ??? 221 <<< 221 testhost.test.ex closing connection @@ -523,7 +523,7 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 250- <<< 250- 98 byte chunk, total 100 ??? 250 -<<< 250 OK id=10HmbF-0005vi-00 +<<< 250 OK id=10HmbF-000000005vi-0000 >>> quit ??? 221 <<< 221 testhost.test.ex closing connection diff --git a/test/stdout/0901 b/test/stdout/0901 index c4020ae5f..b2797046a 100644 --- a/test/stdout/0901 +++ b/test/stdout/0901 @@ -26,7 +26,7 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 250- <<< 250- 88 byte chunk, total 88 ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> quit ??? 221 <<< 221 testhost.test.ex closing connection @@ -66,7 +66,7 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 250- <<< 250- 0 byte chunk, total 100 ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> mail from:someone3@some.domain ??? 250 <<< 250 OK @@ -85,7 +85,7 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 250- <<< 250- 78 byte chunk, total 88 ??? 250 -<<< 250 OK id=10HmaZ-0005vi-00 +<<< 250 OK id=10HmaZ-000000005vi-0000 >>> quit ??? 221 <<< 221 testhost.test.ex closing connection @@ -125,7 +125,7 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 250- <<< 250- 0 byte chunk, total 100 ??? 250 -<<< 250 OK id=10HmbA-0005vi-00 +<<< 250 OK id=10HmbA-000000005vi-0000 >>> mail from:someone3A@some.domain ??? 250 <<< 250 OK @@ -144,7 +144,7 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 250- <<< 250- 78 byte chunk, total 88 ??? 250 -<<< 250 OK id=10HmbB-0005vi-00 +<<< 250 OK id=10HmbB-000000005vi-0000 >>> quit ??? 221 <<< 221 testhost.test.ex closing connection @@ -305,7 +305,7 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 250- <<< 250- 88 byte chunk, total 88 ??? 250 -<<< 250 OK id=10HmbD-0005vi-00 +<<< 250 OK id=10HmbD-000000005vi-0000 >>> quit ??? 221 <<< 221 testhost.test.ex closing connection diff --git a/test/stdout/0904 b/test/stdout/0904 index 52f93b9ed..b2eae3bf7 100644 --- a/test/stdout/0904 +++ b/test/stdout/0904 @@ -10,7 +10,7 @@ MAIL FROM:<> 250 OK RCPT TO:<a@test.ex> 250 OK -BDAT 331 LAST +BDAT 345 LAST 250 OK QUIT 225 OK @@ -26,7 +26,7 @@ MAIL FROM:<> 250 good mail cmd RCPT TO:<b@test.ex> 250 acceptable rcpt cmd -BDAT 331 LAST +BDAT 345 LAST Unexpected EOF read from client Listening on port 1224 ... Connection request from [127.0.0.1] @@ -38,7 +38,7 @@ MAIL FROM:<> 250 OK RCPT TO:<c@test.ex> 250 OK -BDAT 331 LAST +BDAT 345 LAST 250 OK Comparison failed - bailing out @@ -53,7 +53,7 @@ MAIL FROM:<> 250 OK RCPT TO:<d@test.ex> 250 OK -BDAT 331 LAST +BDAT 345 LAST 500 oops QUIT 225 OK @@ -68,7 +68,7 @@ MAIL FROM:<> 250 OK RCPT TO:<e@test.ex> 250 OK -BDAT 331 LAST +BDAT 345 LAST 400 not right now QUIT 225 OK @@ -94,7 +94,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO:<p@test.ex> -BDAT 331 LAST +BDAT 345 LAST 250 OK mail 250 OK rcpt 250 OK bdat @@ -111,7 +111,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO:<r@test.ex> -BDAT 331 LAST +BDAT 345 LAST 250 OK mail 250 OK rcpt 250 OK bdat @@ -127,7 +127,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO:<s@test.ex> -BDAT 331 LAST +BDAT 345 LAST 550 unacceptable mail-from 550 rcpt ungood lacking mail-from 500 bdat ungood lacking mail-from @@ -143,7 +143,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO:<s1@test.ex> -BDAT 332 LAST +BDAT 346 LAST 450 greylisted mail-from 550 rcpt ungood lacking mail-from 500 bdat ungood lacking mail-from @@ -159,7 +159,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO:<t@test.ex> -BDAT 331 LAST +BDAT 345 LAST 250 OK mail 550 no such recipient 500 oops bdat @@ -175,7 +175,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO:<u@test.ex> -BDAT 331 LAST +BDAT 345 LAST 250 OK mail 250 OK rcpt 500 oops bdat @@ -191,7 +191,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO:<v@test.ex> -BDAT 331 LAST +BDAT 345 LAST 250 OK mail 250 OK rcpt 400 not right now bdat diff --git a/test/stdout/0905 b/test/stdout/0905 index cb553e1cf..9a9104a74 100644 --- a/test/stdout/0905 +++ b/test/stdout/0905 @@ -10,7 +10,7 @@ MAIL FROM:<> 250 OK RCPT TO:<a@test.ex> 250 OK -BDAT 297 +BDAT 311 250 OK nonlast bdat BDAT 8380 LAST 250 OK bdat @@ -28,7 +28,7 @@ MAIL FROM:<> 250 OK RCPT TO:<d@test.ex> 250 OK -BDAT 297 +BDAT 311 500 oops bdat-nonlast QUIT 225 OK @@ -42,7 +42,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO:<p@test.ex> -BDAT 297 +BDAT 311 250 OK mail 250 OK rcpt 250 OK nonlast bdat @@ -61,7 +61,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO:<s@test.ex> -BDAT 297 +BDAT 311 550 unacceptable mail-from 550 rcpt ungood lacking mail-from 500 bdat (nonlast) ungood lacking mail-from @@ -77,7 +77,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO:<t@test.ex> -BDAT 297 +BDAT 311 250 OK mail 550 no such recipient 500 oops nonlast bdat - no rcpt @@ -94,7 +94,7 @@ EHLO testhost.test.ex MAIL FROM:<> RCPT TO:<t1@test.ex> RCPT TO:<t2@test.ex> -BDAT 281 +BDAT 295 250 OK mail 550 no such recipient 250 good recipient @@ -113,7 +113,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO:<u@test.ex> -BDAT 297 +BDAT 311 250 OK mail 250 OK rcpt 500 oops nonlast bdat @@ -129,7 +129,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO:<v@test.ex> -BDAT 297 +BDAT 311 250 OK mail 250 OK rcpt 250 OK nonlast bdat @@ -147,7 +147,7 @@ EHLO testhost.test.ex 250 CHUNKING MAIL FROM:<> RCPT TO:<u@test.ex> -BDAT 297 +BDAT 311 250 OK mail 250 OK rcpt 400 oops nonlast bdat @@ -167,7 +167,7 @@ BDAT 8191 250 OK mail 250 OK rcpt 250 OK nonlast bdat -BDAT 809 LAST +BDAT 823 LAST 250 OK bdat QUIT 225 OK diff --git a/test/stdout/0906 b/test/stdout/0906 index 0eb13cc3f..2fbed0632 100644 --- a/test/stdout/0906 +++ b/test/stdout/0906 @@ -118,6 +118,6 @@ Connecting to 127.0.0.1 port 1224 ... connected ??? 250- <<< 250- 8408 byte chunk, total 8408 ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> QUIT End of script diff --git a/test/stdout/0911 b/test/stdout/0911 index b49d16537..00441c8d9 100644 --- a/test/stdout/0911 +++ b/test/stdout/0911 @@ -3,38 +3,38 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello root at tester
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello root at tester
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 myhost.test.ex closing connection
-Message 10HmaZ-0005vi-00 has been removed +Message 10HmaZ-000000005vi-0000 has been removed 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello root at tester
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250 myhost.test.ex Hello root at tester
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
221 myhost.test.ex closing connection
-Message 10HmbB-0005vi-00 has been removed +Message 10HmbB-000000005vi-0000 has been removed ******** SERVER ******** Listening on port 1225 ... @@ -47,7 +47,7 @@ EHLO myhost.test.ex 250 OK MAIL FROM:<> RCPT TO:<good@test.ex> -BDAT 315 LAST +BDAT 329 LAST 250 OK mail 250 OK rcpt QUIT @@ -65,7 +65,7 @@ MAIL FROM:<> 250 OK mail RCPT TO:<nopipe@test.ex> 250 OK rcpt -BDAT 317 LAST +BDAT 331 LAST 250 OK chunked message data QUIT 221 Closing connection @@ -82,7 +82,7 @@ MAIL FROM:<> 250 OK mail RCPT TO:<tempreject@test.ex> 250 OK rcpt -BDAT 321 LAST +BDAT 335 LAST QUIT 451 Service not available 221 Closing connection @@ -100,7 +100,7 @@ MAIL FROM:<> 250 OK mail RCPT TO:<permreject@test.ex> 250 OK rcpt -BDAT 321 LAST +BDAT 335 LAST QUIT 550 content rejected 221 Closing connection @@ -118,6 +118,6 @@ MAIL FROM:<> 250 OK mail RCPT TO:<dataloss@test.ex> 250 OK rcpt -BDAT 319 LAST +BDAT 333 LAST >*eof End of script diff --git a/test/stdout/0998 b/test/stdout/0998 index 0b70fd0f6..739db17c4 100644 --- a/test/stdout/0998 +++ b/test/stdout/0998 @@ -26,18 +26,18 @@ RCPT TO:<CALLER@myhost.test.ex> DATA 354 go ahead Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 X-Failed-Recipients: fred@undeliverable.org Auto-Submitted: auto-replied From: Mail Delivery System <Mailer-Daemon@myhost.test.ex> To: CALLER@myhost.test.ex -References: <E10HmaX-0005vi-00@myhost.test.ex> +References: <E10HmaX-000000005vi-0000@myhost.test.ex> Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM MIME-Version: 1.0 Subject: Mail delivery failed: returning message to sender -Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 --NNNNNNNNNN-eximdsn-MMMMMMMMMM @@ -88,11 +88,11 @@ Content-type: message/rfc822 Return-path: <CALLER@myhost.test.ex> Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for fred@undeliverable.org; Tue, 2 Mar 1999 09:44:33 +0000 Subject: test -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/1001 b/test/stdout/1001 index 7ba8eb07c..dede9eb19 100644 --- a/test/stdout/1001 +++ b/test/stdout/1001 @@ -26,7 +26,7 @@ Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... connected >>> EHLO [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6] >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> ehlo [IPV6:ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6] ??? 250- <<< 250-myhost.test.ex Hello [IPV6:ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6] [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6] @@ -52,7 +52,7 @@ Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... connected >>> EHLO [IPV6:ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6] >>> . ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> ehlo [IPV6:V6NET:0:12:1:a00:20ff:fe86:a062] ??? 250- <<< 250-myhost.test.ex Hello [IPV6:V6NET:0:12:1:a00:20ff:fe86:a062] [ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6] @@ -78,7 +78,7 @@ Connecting to ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 port 1225 ... connected >>> EHLO [IPV6:V6NET:0:12:1:a00:20ff:fe86:a062] >>> . ??? 250 -<<< 250 OK id=10HmaZ-0005vi-00 +<<< 250 OK id=10HmaZ-000000005vi-0000 >>> ehlo ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6 ??? 501 <<< 501 Syntactically invalid EHLO argument(s) diff --git a/test/stdout/1008 b/test/stdout/1008 index 9122d3d05..0fb622a03 100644 --- a/test/stdout/1008 +++ b/test/stdout/1008 @@ -1,18 +1,18 @@ +++++++++++++++++++++++++++ - T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 -45 12865 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 450 Temporary error + T:127.0.0.1:127.0.0.1:1224:10HmaX-000000005vi-0000 -45 12865 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 450 Temporary error first failed = time last try = time2 next try = time2 + 7200 - T:::1:::1:1224:10HmaX-0005vi-00 -45 12865 H=::1 [::1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 450 Temporary error + T:::1:::1:1224:10HmaX-000000005vi-0000 -45 12865 H=::1 [::1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 450 Temporary error first failed = time last try = time2 next try = time2 + 7200 -Transport: 127.0.0.1 [127.0.0.1]:1111 10HmaX-0005vi-00 error -45: H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 450 Temporary error +Transport: 127.0.0.1 [127.0.0.1]:1111 10HmaX-000000005vi-0000 error -45: H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 450 Temporary error first failed: 07-Mar-2000 12:21:52 last tried: 07-Mar-2000 12:21:52 next try at: 07-Mar-2000 12:21:52 -Transport: [:1:::1:1224:10HmaX-0005vi-00]:1224 10HmaX-0005vi-00 error -45: H=::1 [::1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 450 Temporary error +Transport: [:1:::1:1224:10HmaX-000000005vi-0000]:1224 10HmaX-000000005vi-0000 error -45: H=::1 [::1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 450 Temporary error first failed: 07-Mar-2000 12:21:52 last tried: 07-Mar-2000 12:21:52 next try at: 07-Mar-2000 12:21:52 exinext exit code = 0 -Transport: [:1:::1:1224:10HmaX-0005vi-00] error -45: H=::1 [::1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 450 Temporary error +Transport: [:1:::1:1224:10HmaX-000000005vi-0000] error -45: H=::1 [::1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 450 Temporary error first failed: 07-Mar-2000 12:21:52 last tried: 07-Mar-2000 12:21:52 next try at: 07-Mar-2000 12:21:52 diff --git a/test/stdout/1103 b/test/stdout/1103 index 717be0d36..6bedb029a 100644 --- a/test/stdout/1103 +++ b/test/stdout/1103 @@ -76,7 +76,7 @@ Succeeded in starting TLS >>> This is a test encrypted message. >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection diff --git a/test/stdout/1104 b/test/stdout/1104 index ac5245cba..3fcc501b3 100644 --- a/test/stdout/1104 +++ b/test/stdout/1104 @@ -52,7 +52,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected >>> This is a test unencrypted message. >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection diff --git a/test/stdout/1108 b/test/stdout/1108 index 14e05d71d..de269abc5 100644 --- a/test/stdout/1108 +++ b/test/stdout/1108 @@ -42,7 +42,7 @@ Succeeded in starting TLS >>> This is a test encrypted message. >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection diff --git a/test/stdout/1110 b/test/stdout/1110 index 2a896e50c..cf8661c6e 100644 --- a/test/stdout/1110 +++ b/test/stdout/1110 @@ -26,7 +26,7 @@ Succeeded in starting TLS >>> This is a test encrypted message. >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection @@ -53,7 +53,7 @@ Succeeded in starting TLS >>> This is a test encrypted message from a verified host. >>> . ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection diff --git a/test/stdout/1114 b/test/stdout/1114 index f08abd10b..91aa52559 100644 --- a/test/stdout/1114 +++ b/test/stdout/1114 @@ -48,7 +48,7 @@ Succeeded in starting TLS ??? 250- <<< 250- 88 byte chunk, total 88 ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> QUIT ??? 221 <<< 221 testhost.test.ex closing connection @@ -97,7 +97,7 @@ Succeeded in starting TLS ??? 250- <<< 250- 88 byte chunk, total 88 ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> QUIT ??? 221 <<< 221 testhost.test.ex closing connection diff --git a/test/stdout/1161 b/test/stdout/1161 index ea43216f3..cfc023494 100644 --- a/test/stdout/1161 +++ b/test/stdout/1161 @@ -31,10 +31,10 @@ DATA 354 Go ahead Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/2002 b/test/stdout/2002 index 5fba31aa4..e8707e377 100644 --- a/test/stdout/2002 +++ b/test/stdout/2002 @@ -42,7 +42,7 @@ Succeeded in starting TLS >>> This is a test encrypted message. >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection @@ -83,7 +83,7 @@ Succeeded in starting TLS >>> This is a test encrypted message. >>> . ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection @@ -152,7 +152,7 @@ Succeeded in starting TLS >>> This is a test encrypted message from a verified host. >>> . ??? 250 -<<< 250 OK id=10HmaZ-0005vi-00 +<<< 250 OK id=10HmaZ-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection @@ -194,7 +194,7 @@ Succeeded in starting TLS >>> It should be sent under the RSA server cert and with an RSA cipher. >>> . ??? 250 -<<< 250 OK id=10HmbA-0005vi-00 +<<< 250 OK id=10HmbA-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection @@ -236,7 +236,7 @@ Succeeded in starting TLS >>> It should be sent under the EC server cert and with an ECDSA cipher. >>> . ??? 250 -<<< 250 OK id=10HmbB-0005vi-00 +<<< 250 OK id=10HmbB-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection diff --git a/test/stdout/2102 b/test/stdout/2102 index 4706a692d..7f8e4f825 100644 --- a/test/stdout/2102 +++ b/test/stdout/2102 @@ -42,7 +42,7 @@ Succeeded in starting TLS >>> This is a test encrypted message. >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection @@ -91,7 +91,7 @@ Succeeded in starting TLS >>> This is a test encrypted message. >>> . ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection @@ -169,7 +169,7 @@ Succeeded in starting TLS >>> This is a test encrypted message from a verified host. >>> . ??? 250 -<<< 250 OK id=10HmaZ-0005vi-00 +<<< 250 OK id=10HmaZ-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection @@ -219,7 +219,7 @@ Succeeded in starting TLS >>> It should be sent under the EC server cert and with an ECDSA cipher. >>> . ??? 250 -<<< 250 OK id=10HmbA-0005vi-00 +<<< 250 OK id=10HmbA-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection diff --git a/test/stdout/2132.openssl_1_1_1 b/test/stdout/2132.openssl_1_1_1 index 6327b612a..08dbaa344 100644 --- a/test/stdout/2132.openssl_1_1_1 +++ b/test/stdout/2132.openssl_1_1_1 @@ -35,7 +35,7 @@ Succeeded in starting TLS >>> This is a test encrypted message. >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection @@ -77,7 +77,7 @@ Succeeded in starting TLS >>> This is a test encrypted message. >>> . ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection @@ -151,7 +151,7 @@ Succeeded in starting TLS >>> This is a test encrypted message from a verified host. >>> . ??? 250 -<<< 250 OK id=10HmaZ-0005vi-00 +<<< 250 OK id=10HmaZ-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection diff --git a/test/stdout/3400 b/test/stdout/3400 index 5efa690dc..9ed13f173 100644 --- a/test/stdout/3400 +++ b/test/stdout/3400 @@ -80,26 +80,26 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
235 Authentication succeeded
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
501 invalid data for AUTH
250 Reset OK
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
@@ -154,7 +154,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbC-0005vi-00
+250 OK id=10HmbC-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
@@ -331,17 +331,17 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbD-0005vi-00
+250 OK id=10HmbD-000000005vi-0000
235 Authentication succeeded
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbE-0005vi-00
+250 OK id=10HmbE-000000005vi-0000
503 already authenticated
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbF-0005vi-00
+250 OK id=10HmbF-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
diff --git a/test/stdout/3401 b/test/stdout/3401 index 4de91c262..4966e89ca 100644 --- a/test/stdout/3401 +++ b/test/stdout/3401 @@ -21,10 +21,10 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -50,10 +50,10 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -79,10 +79,10 @@ DATA 354 Send data 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 for userx@domain.com; 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 @@ -142,10 +142,10 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbF-0005vi-00 + id 10HmbF-000000005vi-0000 for forcesender@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbF-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbF-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -191,10 +191,10 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbI-0005vi-00 + id 10HmbI-000000005vi-0000 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbI-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbI-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/3403 b/test/stdout/3403 index 299e3ca67..e95ad4553 100644 --- a/test/stdout/3403 +++ b/test/stdout/3403 @@ -10,5 +10,5 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
diff --git a/test/stdout/3404 b/test/stdout/3404 index 7a5a1c3b0..9d56f12c9 100644 --- a/test/stdout/3404 +++ b/test/stdout/3404 @@ -17,10 +17,10 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-AID: >CALLER< @@ -47,10 +47,10 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-AID: >zzz< @@ -81,10 +81,10 @@ DATA 354 Send data 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 for userx@domain.com; 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 X-AID: >CALLER< diff --git a/test/stdout/3405 b/test/stdout/3405 index d90cd691c..7d04e7c54 100644 --- a/test/stdout/3405 +++ b/test/stdout/3405 @@ -17,10 +17,10 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-AID: >CALLER< @@ -48,10 +48,10 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-AID: >CALLER< diff --git a/test/stdout/3408 b/test/stdout/3408 index b5fffd08e..e17265c20 100644 --- a/test/stdout/3408 +++ b/test/stdout/3408 @@ -14,7 +14,7 @@ 250 Accepted
550 host is listed in rbl.test.ex
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -36,7 +36,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/3411 b/test/stdout/3411 index 14230657d..164afd2e4 100644 --- a/test/stdout/3411 +++ b/test/stdout/3411 @@ -13,5 +13,5 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
diff --git a/test/stdout/3412 b/test/stdout/3412 index d6eebaf43..2e2a3f633 100644 --- a/test/stdout/3412 +++ b/test/stdout/3412 @@ -16,18 +16,18 @@ RCPT TO:<CALLER@myhost.test.ex> DATA 354 Send data Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 X-Failed-Recipients: x@test.ex Auto-Submitted: auto-replied From: Mail Delivery System <Mailer-Daemon@myhost.test.ex> To: CALLER@myhost.test.ex -References: <E10HmaX-0005vi-00@myhost.test.ex> +References: <E10HmaX-000000005vi-0000@myhost.test.ex> Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM MIME-Version: 1.0 Subject: Mail delivery failed: returning message to sender -Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 --NNNNNNNNNN-eximdsn-MMMMMMMMMM @@ -56,10 +56,10 @@ Content-type: message/rfc822 Return-path: <CALLER@myhost.test.ex> Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for x@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/3415 b/test/stdout/3415 index 11060a1b9..6631174a9 100644 --- a/test/stdout/3415 +++ b/test/stdout/3415 @@ -28,7 +28,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 354 Enter message, ending with "." on a line by itself >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> mail from:<> ??? 250 <<< 250 OK @@ -40,7 +40,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 354 Enter message, ending with "." on a line by itself >>> . ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection @@ -75,7 +75,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 354 Enter message, ending with "." on a line by itself >>> . ??? 250 -<<< 250 OK id=10HmaZ-0005vi-00 +<<< 250 OK id=10HmaZ-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection @@ -110,7 +110,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 354 Enter message, ending with "." on a line by itself >>> . ??? 250 -<<< 250 OK id=10HmbA-0005vi-00 +<<< 250 OK id=10HmbA-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection @@ -146,12 +146,12 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> From: abc@x.y.z >>> . ??? 250 -<<< 250 OK id=10HmbB-0005vi-00 +<<< 250 OK id=10HmbB-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection End of script -10HmaX-0005vi-00-H +10HmaX-000000005vi-0000-H EXIMUSER EXIM_UID EXIM_GID <username@myhost.test.ex> ddddddddd 0 @@ -174,14 +174,14 @@ x@y dddP Received: from [127.0.0.1] (helo=rhu.barb) by myhost.test.ex with esmtpa (Exim x.yz) (envelope-from <username@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> dddF From: a@y dddS Sender: username@myhost.test.ex 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 -10HmaY-0005vi-00-H +10HmaY-000000005vi-0000-H EXIMUSER EXIM_UID EXIM_GID <> ddddddddd 0 @@ -203,13 +203,13 @@ x@y dddP Received: from [127.0.0.1] (helo=rhu.barb) by myhost.test.ex with esmtpa (Exim x.yz) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> dddF From: username@myhost.test.ex 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 -10HmaZ-0005vi-00-H +10HmaZ-000000005vi-0000-H EXIMUSER EXIM_UID EXIM_GID <> ddddddddd 0 @@ -231,13 +231,13 @@ x@y dddP Received: from [127.0.0.1] (helo=rhu.barb) by myhost.test.ex with esmtpa (Exim x.yz) - id 10HmaZ-0005vi-00 + id 10HmaZ-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex> dddF From: username@another.domain 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 -10HmbA-0005vi-00-H +10HmbA-000000005vi-0000-H EXIMUSER EXIM_UID EXIM_GID <> ddddddddd 0 @@ -259,13 +259,13 @@ x@y dddP Received: from [127.0.0.1] (helo=rhu.barb) by myhost.test.ex with esmtpa (Exim x.yz) - id 10HmbA-0005vi-00 + id 10HmbA-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -047I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex> dddF From: username@auth.id.domain 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 -10HmbB-0005vi-00-H +10HmbB-000000005vi-0000-H EXIMUSER EXIM_UID EXIM_GID <> ddddddddd 0 @@ -287,10 +287,10 @@ x@y dddP Received: from [127.0.0.1] (helo=rhu.barb) by myhost.test.ex with esmtpa (Exim x.yz) - id 10HmbB-0005vi-00 + id 10HmbB-000000005vi-0000 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 dddF From: abc@x.y.z -047I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> +054I Message-Id: <E10HmbB-000000005vi-0000@myhost.test.ex> dddS Sender: username@auth.id.domain 038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/3500 b/test/stdout/3500 index 326da7880..ee35a18ba 100644 --- a/test/stdout/3500 +++ b/test/stdout/3500 @@ -13,7 +13,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]
@@ -63,7 +63,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -88,7 +88,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/3501 b/test/stdout/3501 index 0ec27c845..dd0962df0 100644 --- a/test/stdout/3501 +++ b/test/stdout/3501 @@ -19,10 +19,10 @@ DATA 354 Send data Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/3551 b/test/stdout/3551 index 8d9d882f7..85cf6f538 100644 --- a/test/stdout/3551 +++ b/test/stdout/3551 @@ -12,7 +12,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
### ditto, on two lines from client rather than three; fails ### (not legit; the username & passwd should be suplied separately in response to prompts) diff --git a/test/stdout/3600 b/test/stdout/3600 index 7d3707945..1254d6cb2 100644 --- a/test/stdout/3600 +++ b/test/stdout/3600 @@ -1,4 +1,4 @@ -Message 10HmaY-0005vi-00 has been modified +Message 10HmaY-000000005vi-0000 has been modified Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/4000 b/test/stdout/4000 index efcc83661..e38902d59 100644 --- a/test/stdout/4000 +++ b/test/stdout/4000 @@ -7,7 +7,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
@@ -18,7 +18,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
@@ -29,7 +29,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
@@ -40,7 +40,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
@@ -51,7 +51,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbC-0005vi-00
+250 OK id=10HmbC-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
@@ -62,7 +62,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbD-0005vi-00
+250 OK id=10HmbD-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
@@ -73,7 +73,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbE-0005vi-00
+250 OK id=10HmbE-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
diff --git a/test/stdout/4001 b/test/stdout/4001 index e0e8de066..63b44505f 100644 --- a/test/stdout/4001 +++ b/test/stdout/4001 @@ -12,28 +12,28 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
**** SMTP testing: that is not a real message id! 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
**** SMTP testing: that is not a real message id! 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/4002 b/test/stdout/4002 index 2db3157dd..9bbff7f0f 100644 --- a/test/stdout/4002 +++ b/test/stdout/4002 @@ -7,7 +7,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
diff --git a/test/stdout/4003 b/test/stdout/4003 index f0a931b3b..333ef2e4f 100644 --- a/test/stdout/4003 +++ b/test/stdout/4003 @@ -7,7 +7,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello fromuser at test.ex
@@ -18,7 +18,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello fromuser at test.ex
@@ -29,7 +29,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello fromuser at test.ex
@@ -40,7 +40,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
221 myhost.test.ex closing connection
******** SERVER ******** @@ -56,11 +56,11 @@ Connection request from [127.0.0.1] <Received: from fromuser (helo=test.ex) < by myhost.test.ex with local-esmtp (Exim x.yz) < (envelope-from <fromuser@myhost.test.ex>) -< id 10HmaX-0005vi-00 +< id 10HmaX-000000005vi-0000 < for userx@test.ex; < Tue, 2 Mar 1999 09:44:33 +0000 <Content-type: text/plain -<Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +<Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> <From: fromuser@myhost.test.ex <Date: Tue, 2 Mar 1999 09:44:33 +0000 < @@ -101,11 +101,11 @@ Connection request from [127.0.0.1] <Received: from fromuser (helo=test.ex) < by myhost.test.ex with local-esmtp (Exim x.yz) < (envelope-from <fromuser@myhost.test.ex>) -< id 10HmaY-0005vi-00 +< id 10HmaY-000000005vi-0000 < for userx@test.ex; < Tue, 2 Mar 1999 09:44:33 +0000 <Content-type: text/plain -<Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +<Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> <From: fromuser@myhost.test.ex <Date: Tue, 2 Mar 1999 09:44:33 +0000 < @@ -147,11 +147,11 @@ Connection request from [127.0.0.1] <Received: from fromuser (helo=test.ex) < by myhost.test.ex with local-esmtp (Exim x.yz) < (envelope-from <fromuser@myhost.test.ex>) -< id 10HmaZ-0005vi-00 +< id 10HmaZ-000000005vi-0000 < for userx@test.ex; < Tue, 2 Mar 1999 09:44:33 +0000 <Content-type: text/plain -<Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> +<Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex> <From: fromuser@myhost.test.ex <Date: Tue, 2 Mar 1999 09:44:33 +0000 < @@ -192,11 +192,11 @@ Connection request from [127.0.0.1] <Received: from fromuser (helo=test.ex) < by myhost.test.ex with local-esmtp (Exim x.yz) < (envelope-from <fromuser@myhost.test.ex>) -< id 10HmbA-0005vi-00 +< id 10HmbA-000000005vi-0000 < for userx@test.ex; < Tue, 2 Mar 1999 09:44:33 +0000 <Content-type: text/plain -<Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> +<Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex> <From: fromuser@myhost.test.ex <Date: Tue, 2 Mar 1999 09:44:33 +0000 < diff --git a/test/stdout/4004 b/test/stdout/4004 index 021f5a354..40d631402 100644 --- a/test/stdout/4004 +++ b/test/stdout/4004 @@ -7,7 +7,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
******** SERVER ******** @@ -15,7 +15,7 @@ Listening on port 11333 ... Connection request from [127.0.0.1] <CHECK RSPAMC/1.3 <Content-length: ddd -<Queue-Id: 10HmaX-0005vi-00 +<Queue-Id: 10HmaX-000000005vi-0000 <From: <CALLER@myhost.test.ex> <Recipient-Number: 1 <Rcpt: <userx@test.ex> @@ -28,12 +28,12 @@ Connection request from [127.0.0.1] <Received: from CALLER (helo=test.ex) < by myhost.test.ex with local-esmtp (Exim x.yz) < (envelope-from <CALLER@myhost.test.ex>) -< id 10HmaX-0005vi-00 +< id 10HmaX-000000005vi-0000 < for userx@test.ex; < Tue, 2 Mar 1999 09:44:33 +0000 <From: MAILER_DAEMON <> <Content-type: text/plain -<Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +<Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> <Sender: CALLER_NAME <CALLER@myhost.test.ex> <Date: Tue, 2 Mar 1999 09:44:33 +0000 < diff --git a/test/stdout/4006 b/test/stdout/4006 index 480b558ff..39339ba02 100644 --- a/test/stdout/4006 +++ b/test/stdout/4006 @@ -7,7 +7,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
@@ -51,7 +51,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
@@ -62,7 +62,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbC-0005vi-00
+250 OK id=10HmbC-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
@@ -73,25 +73,25 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbD-0005vi-00
+250 OK id=10HmbD-000000005vi-0000
221 myhost.test.ex closing connection
******** SERVER ******** Listening on TESTSUITE/eximdir/clam_sock ... Connection request -<SCAN TESTSUITE/spool/scan/10HmbB-0005vi-00/10HmbB-0005vi-00.eml +<SCAN TESTSUITE/spool/scan/10HmbB-000000005vi-0000/10HmbB-000000005vi-0000.eml >LF>scanned_file_name: OK Expected EOF read from client End of script Listening on TESTSUITE/eximdir/clam_sock ... Connection request -<SCAN TESTSUITE/spool/scan/10HmaX-0005vi-00/10HmaX-0005vi-00.eml +<SCAN TESTSUITE/spool/scan/10HmaX-000000005vi-0000/10HmaX-000000005vi-0000.eml >LF>scanned_file_name: 666 ERROR Expected EOF read from client End of script Listening on TESTSUITE/eximdir/clam_sock ... Connection request -<SCAN TESTSUITE/spool/scan/10HmbA-0005vi-00/10HmbA-0005vi-00.eml +<SCAN TESTSUITE/spool/scan/10HmbA-000000005vi-0000/10HmbA-000000005vi-0000.eml >LF>scanned_file_name: VNAME FOUND Expected EOF read from client End of script @@ -106,7 +106,7 @@ End of script Inital pause of 2 seconds Listening on TESTSUITE/eximdir/clam_sock ... Connection request -<SCAN TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00.eml +<SCAN TESTSUITE/spool/scan/10HmbC-000000005vi-0000/10HmbC-000000005vi-0000.eml >LF>scanned_file_name: OK Expected EOF read from client End of script @@ -118,12 +118,12 @@ Connection request from [127.0.0.1] <Received: from CALLER (helo=test.ex) < by myhost.test.ex with local-esmtp (Exim x.yz) < (envelope-from <CALLER@myhost.test.ex>) -< id 10HmbD-0005vi-00 +< id 10HmbD-000000005vi-0000 < for userx@test.ex; < Tue, 2 Mar 1999 09:44:33 +0000 <Date: Tue, 2 Mar 1999 09:44:33 +0000 <Subject: message should be accepted -<Message-Id: <E10HmbD-0005vi-00@myhost.test.ex> +<Message-Id: <E10HmbD-000000005vi-0000@myhost.test.ex> <From: CALLER_NAME <CALLER@myhost.test.ex> < < diff --git a/test/stdout/4007 b/test/stdout/4007 index 32adb0910..07de64414 100644 --- a/test/stdout/4007 +++ b/test/stdout/4007 @@ -7,7 +7,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbC-0005vi-00
+250 OK id=10HmbC-000000005vi-0000
221 myhost.test.ex closing connection
### (non-internal) scanner error -> paniclog 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
@@ -52,7 +52,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 myhost.test.ex closing connection
### internal scanner error, no panic log 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
@@ -74,7 +74,7 @@ Connection request <FLAGS -fullfiles >LF>210 FLAGS DATA >LF>200 FLAGS OK -<SCAN TESTSUITE/spool/scan/10HmbC-0005vi-00 +<SCAN TESTSUITE/spool/scan/10HmbC-000000005vi-0000 >LF>210 SCAN DATA >LF>blah\x09[+] >LF>200 SCAN OK @@ -85,7 +85,7 @@ End of script Listening on TESTSUITE/eximdir/avast_sock ... Connection request >LF>220 ready -<SCAN TESTSUITE/spool/scan/10HmaX-0005vi-00 +<SCAN TESTSUITE/spool/scan/10HmaX-000000005vi-0000 >LF>210 SCAN DATA >LF>blah\x09[E]0.0\x09Error 13 Permission\\ denied >LF>451 SCAN Engine error 13 Permission denied @@ -95,7 +95,7 @@ End of script Listening on TESTSUITE/eximdir/avast_sock ... Connection request >LF>220 ready -<SCAN TESTSUITE/spool/scan/10HmbA-0005vi-00 +<SCAN TESTSUITE/spool/scan/10HmbA-000000005vi-0000 >LF>210 SCAN DATA >LF>b\\ l\\ a\\ h\x09[L]9.0\x090 VNAME >LF>200 SCAN OK @@ -114,7 +114,7 @@ End of script Listening on TESTSUITE/eximdir/avast_sock ... Connection request >LF>220 ready -<SCAN TESTSUITE/spool/scan/10HmbB-0005vi-00 +<SCAN TESTSUITE/spool/scan/10HmbB-000000005vi-0000 >LF>210 SCAN DATA >LF>blah\x09[E]0.0\x09Error 42110 The\\ file\\ is\\ a\\ decompression\\ bomb >LF>200 SCAN OK diff --git a/test/stdout/4008 b/test/stdout/4008 index c72e085ce..b98a53c68 100644 --- a/test/stdout/4008 +++ b/test/stdout/4008 @@ -7,7 +7,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
@@ -40,5 +40,5 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
diff --git a/test/stdout/4009 b/test/stdout/4009 index a23806e00..fb69ffcf6 100644 --- a/test/stdout/4009 +++ b/test/stdout/4009 @@ -7,7 +7,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
@@ -51,25 +51,25 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 myhost.test.ex closing connection
******** SERVER ******** Listening on TESTSUITE/eximdir/sophie_sock ... Connection request -<TESTSUITE/spool/scan/10HmbB-0005vi-00 +<TESTSUITE/spool/scan/10HmbB-000000005vi-0000 >0 no problems mate Expected EOF read from client End of script Listening on TESTSUITE/eximdir/sophie_sock ... Connection request -<TESTSUITE/spool/scan/10HmaX-0005vi-00 +<TESTSUITE/spool/scan/10HmaX-000000005vi-0000 >-1 oops, internal error in scanner Expected EOF read from client End of script Listening on TESTSUITE/eximdir/sophie_sock ... Connection request -<TESTSUITE/spool/scan/10HmbA-0005vi-00 +<TESTSUITE/spool/scan/10HmbA-000000005vi-0000 >LF>1 VNAME Expected EOF read from client End of script diff --git a/test/stdout/4010 b/test/stdout/4010 index e705096f6..a4933d219 100644 --- a/test/stdout/4010 +++ b/test/stdout/4010 @@ -7,7 +7,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
@@ -40,7 +40,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
@@ -65,7 +65,7 @@ Connection request >ignored_response <CONFIGURE MIME 1 >ignored_response -<SCAN TESTSUITE/spool/scan/10HmbB-0005vi-00/10HmbB-0005vi-00.eml +<SCAN TESTSUITE/spool/scan/10HmbB-000000005vi-0000/10HmbB-000000005vi-0000.eml >LF>random ignored line >LF>random ignored line 2 >LF>OK\x09Scan ok. @@ -81,7 +81,7 @@ Connection request >ignored_response <CONFIGURE MIME 1 >ignored_response -<SCAN TESTSUITE/spool/scan/10HmaZ-0005vi-00/10HmaZ-0005vi-00.eml +<SCAN TESTSUITE/spool/scan/10HmaZ-000000005vi-0000/10HmaZ-000000005vi-0000.eml >LF>xxxINFECTED\x09blah\x09VNAME\x09blah >LF>OK\x09Scan ok. Expected EOF read from client @@ -104,7 +104,7 @@ Connection request >ignored_response <CONFIGURE MIME 1 >ignored_response -<SCAN TESTSUITE/spool/scan/10HmbA-0005vi-00/10HmbA-0005vi-00.eml +<SCAN TESTSUITE/spool/scan/10HmbA-000000005vi-0000/10HmbA-000000005vi-0000.eml >LF>xxxINFECTED\x09blah\x09VNAME\x09blah >LF>OK\x09Scan ok. Expected EOF read from client diff --git a/test/stdout/4011 b/test/stdout/4011 index db7a98ebe..04a7ad4a5 100644 --- a/test/stdout/4011 +++ b/test/stdout/4011 @@ -7,7 +7,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbD-0005vi-00
+250 OK id=10HmbD-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
@@ -51,7 +51,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
@@ -62,7 +62,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
@@ -80,7 +80,7 @@ Listening on TESTSUITE/eximdir/aveserver_sock ... Connection request >200 ready -<SCAN bPQRSTUW TESTSUITE/spool/scan/10HmbD-0005vi-00/10HmbD-0005vi-00.eml +<SCAN bPQRSTUW TESTSUITE/spool/scan/10HmbD-000000005vi-0000/10HmbD-000000005vi-0000.eml >200 done <quit >200 ready @@ -89,7 +89,7 @@ End of script Listening on TESTSUITE/eximdir/aveserver_sock ... Connection request >2xx ready -<SCAN bPQRSTUW TESTSUITE/spool/scan/10HmaX-0005vi-00/10HmaX-0005vi-00.eml +<SCAN bPQRSTUW TESTSUITE/spool/scan/10HmaX-000000005vi-0000/10HmaX-000000005vi-0000.eml >5xx defer <quit >2xx ready @@ -98,7 +98,7 @@ End of script Listening on TESTSUITE/eximdir/aveserver_sock ... Connection request >2xx ready -<SCAN bPQRSTUW TESTSUITE/spool/scan/10HmbB-0005vi-00/10HmbB-0005vi-00.eml +<SCAN bPQRSTUW TESTSUITE/spool/scan/10HmbB-000000005vi-0000/10HmbB-000000005vi-0000.eml >322 VNAME found >2xx ready <quit @@ -116,7 +116,7 @@ End of script Listening on TESTSUITE/eximdir/aveserver_sock ... Connection request >2xx ready -<SCAN bPQRSTUW TESTSUITE/spool/scan/10HmbA-0005vi-00/10HmbA-0005vi-00.eml +<SCAN bPQRSTUW TESTSUITE/spool/scan/10HmbA-000000005vi-0000/10HmbA-000000005vi-0000.eml >5xx defer <quit >2xx ready @@ -125,7 +125,7 @@ End of script Listening on TESTSUITE/eximdir/aveserver_sock ... Connection request >2xx ready -<SCAN bPQRSTUW TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00.eml +<SCAN bPQRSTUW TESTSUITE/spool/scan/10HmbC-000000005vi-0000/10HmbC-000000005vi-0000.eml >322 VNAME found >2xx ready <quit diff --git a/test/stdout/4012 b/test/stdout/4012 index 6d66c7d64..95a9453ce 100644 --- a/test/stdout/4012 +++ b/test/stdout/4012 @@ -7,7 +7,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
@@ -40,20 +40,20 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
221 myhost.test.ex closing connection
******** SERVER ******** Listening on port 1224 ... Connection request from [IP_LOOPBACK_ADDR] -<GET TESTSUITE/spool/scan/10HmaZ-0005vi-00/10HmaZ-0005vi-00.eml HTTP/1.0 +<GET TESTSUITE/spool/scan/10HmaZ-000000005vi-0000/10HmaZ-000000005vi-0000.eml HTTP/1.0 < ><summary code="11"> >*eof End of script Listening on port 1224 ... Connection request from [IP_LOOPBACK_ADDR] -<GET TESTSUITE/spool/scan/10HmaX-0005vi-00/10HmaX-0005vi-00.eml HTTP/1.0 +<GET TESTSUITE/spool/scan/10HmaX-000000005vi-0000/10HmaX-000000005vi-0000.eml HTTP/1.0 < > > @@ -65,11 +65,11 @@ Connection request from [IP_LOOPBACK_ADDR] End of script Listening on port 1224 ... Connection request from [IP_LOOPBACK_ADDR] -<GET TESTSUITE/spool/scan/10HmaY-0005vi-00/10HmaY-0005vi-00.eml HTTP/1.0 +<GET TESTSUITE/spool/scan/10HmaY-000000005vi-0000/10HmaY-000000005vi-0000.eml HTTP/1.0 *sleep 3 End of script Listening on port 1224 ... Connection request from [IP_LOOPBACK_ADDR] -<GET TESTSUITE/spool/scan/10HmbA-0005vi-00/10HmbA-0005vi-00.eml HTTP/1.0 +<GET TESTSUITE/spool/scan/10HmbA-000000005vi-0000/10HmbA-000000005vi-0000.eml HTTP/1.0 *sleep 3 End of script diff --git a/test/stdout/4013 b/test/stdout/4013 index dd4eddeee..5ed067271 100644 --- a/test/stdout/4013 +++ b/test/stdout/4013 @@ -7,7 +7,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
@@ -40,29 +40,29 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
******** SERVER ******** Listening on port 1224 ... Connection request from [IP_LOOPBACK_ADDR] -<SCAN FILE TESTSUITE/spool/scan/10HmbA-0005vi-00/10HmbA-0005vi-00.eml +<SCAN FILE TESTSUITE/spool/scan/10HmbA-000000005vi-0000/10HmbA-000000005vi-0000.eml >0 <clean> >*eof End of script Listening on port 1224 ... Connection request from [IP_LOOPBACK_ADDR] -<SCAN FILE TESTSUITE/spool/scan/10HmaZ-0005vi-00/10HmaZ-0005vi-00.eml ->0 <infected: EICAR_Test_File> DIR/spool/scan/10HmbB-0005vi-00/10HmbB-0005vi-00.eml +<SCAN FILE TESTSUITE/spool/scan/10HmaZ-000000005vi-0000/10HmaZ-000000005vi-0000.eml +>0 <infected: EICAR_Test_File> DIR/spool/scan/10HmaX-0005vi-00/10HmaX-0005vi-00.eml >*eof End of script Listening on port 1224 ... Connection request from [IP_LOOPBACK_ADDR] -<SCAN FILE TESTSUITE/spool/scan/10HmaX-0005vi-00/10HmaX-0005vi-00.eml +<SCAN FILE TESTSUITE/spool/scan/10HmaX-000000005vi-0000/10HmaX-000000005vi-0000.eml *sleep 3 End of script Listening on port 1224 ... Connection request from [IP_LOOPBACK_ADDR] -<SCAN FILE TESTSUITE/spool/scan/10HmaY-0005vi-00/10HmaY-0005vi-00.eml +<SCAN FILE TESTSUITE/spool/scan/10HmaY-000000005vi-0000/10HmaY-000000005vi-0000.eml *sleep 3 End of script diff --git a/test/stdout/4014 b/test/stdout/4014 index fa6770563..e0d02cadb 100644 --- a/test/stdout/4014 +++ b/test/stdout/4014 @@ -7,7 +7,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
@@ -24,12 +24,12 @@ ******** SERVER ******** Listening on port 1224 ... Connection request from [IP_LOOPBACK_ADDR] -TESTSUITE/spool/scan/10HmaY-0005vi-00/10HmaY-0005vi-00.eml +TESTSUITE/spool/scan/10HmaY-000000005vi-0000/10HmaY-000000005vi-0000.eml >LF>RESULT: OK End of script Listening on port 1224 ... Connection request from [IP_LOOPBACK_ADDR] -TESTSUITE/spool/scan/10HmaX-0005vi-00/10HmaX-0005vi-00.eml +TESTSUITE/spool/scan/10HmaX-000000005vi-0000/10HmaX-000000005vi-0000.eml >LF>RESULT: BAD >LF>NAME: wibble End of script diff --git a/test/stdout/4015 b/test/stdout/4015 index 0e8530164..072c57e2b 100644 --- a/test/stdout/4015 +++ b/test/stdout/4015 @@ -7,7 +7,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
******** SERVER ******** @@ -15,7 +15,7 @@ Listening on port 7833 ... Connection request from [127.0.0.1] <REPORT SPAMC/1.2 <User: nobody -<Content-length: 466 +<Content-length: 480 < <From MAILER-DAEMON Tue Mar 02 09:44:33 1999 <X-Envelope-From: <fromuser@myhost.test.ex> @@ -23,11 +23,11 @@ Connection request from [127.0.0.1] <Received: from fromuser (helo=test.ex) < by myhost.test.ex with local-esmtp (Exim x.yz) < (envelope-from <fromuser@myhost.test.ex>) -< id 10HmaX-0005vi-00 +< id 10HmaX-000000005vi-0000 < for userx@test.ex; < Tue, 2 Mar 1999 09:44:33 +0000 <Content-type: text/plain -<Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +<Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> <From: fromuser@myhost.test.ex <Date: Tue, 2 Mar 1999 09:44:33 +0000 < diff --git a/test/stdout/4017 b/test/stdout/4017 index 7d731ae90..079b7dade 100644 --- a/test/stdout/4017 +++ b/test/stdout/4017 @@ -8,7 +8,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
221 myhost.test.ex closing connection
### scanner tmpfail -> defer 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
@@ -64,7 +64,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbC-0005vi-00
+250 OK id=10HmbC-000000005vi-0000
221 myhost.test.ex closing connection
******** SERVER ******** @@ -77,7 +77,7 @@ Connection request >LF>FLAGS -fullfiles >LF>FLAGS +extra >LF>200 FLAGS OK -<SCAN TESTSUITE/spool/scan/10HmbB-0005vi-00 +<SCAN TESTSUITE/spool/scan/10HmbB-000000005vi-0000 >LF>210 SCAN DATA >LF>/bin/clean1\x09[+] >LF>/bin/clean2\x09[+] @@ -89,7 +89,7 @@ End of script Listening on TESTSUITE/eximdir/avast_sock ... Connection request >LF>220 ready -<SCAN TESTSUITE/spool/scan/10HmaX-0005vi-00 +<SCAN TESTSUITE/spool/scan/10HmaX-000000005vi-0000 >LF>210 SCAN DATA >LF>/bin/error\x09[E]0.0\x09Error 13 Permission\\ denied >LF>451 SCAN Engine error 13 Permission denied @@ -99,7 +99,7 @@ End of script Listening on TESTSUITE/eximdir/avast_sock ... Connection request >LF>220 ready -<SCAN TESTSUITE/spool/scan/10HmaY-0005vi-00 +<SCAN TESTSUITE/spool/scan/10HmaY-000000005vi-0000 >LF>210 SCAN DATA >LF>/bin/clean\x09[+] >LF>v\\ i\\ a\\ r\\ u\\ s\x09[L]9.0\x090 This\\ is\\ not\\ even\\ an\\ EICAR\\ test\\ virus. @@ -110,7 +110,7 @@ End of script Listening on TESTSUITE/eximdir/avast_sock ... Connection request >LF>220 ready -<SCAN TESTSUITE/spool/scan/10HmaZ-0005vi-00 +<SCAN TESTSUITE/spool/scan/10HmaZ-000000005vi-0000 >LF>210 SCAN DATA >LF>/bin/clean\x09[+] >LF>/bin/error\x09[E]0.0\x09Error 42110 The\\ file\\ is\\ a\\ decompression\\ bomb @@ -122,7 +122,7 @@ End of script Listening on TESTSUITE/eximdir/avast_sock ... Connection request >LF>220 ready -<SCAN TESTSUITE/spool/scan/10HmbA-0005vi-00 +<SCAN TESTSUITE/spool/scan/10HmbA-000000005vi-0000 >LF>210 SCAN DATA >LF>/bin/clean\x09[+] >LF>/bin/error\x09[E]0.0\x09Error 42110 The\\ file\\ is\\ a\\ decompression\\ bomb @@ -133,7 +133,7 @@ End of script Listening on TESTSUITE/eximdir/avast_sock ... Connection request >LF>220 ready -<SCAN TESTSUITE/spool/scan/10HmbC-0005vi-00 +<SCAN TESTSUITE/spool/scan/10HmbC-000000005vi-0000 >LF>210 SCAN DATA >LF>/bin/clean\x09[+] >LF>/bin/error\x09[E]0.0\x09Error 42110 The\\ file\\ is\\ a\\ decompression\\ bomb diff --git a/test/stdout/4020 b/test/stdout/4020 index 293f5136e..5890d218f 100644 --- a/test/stdout/4020 +++ b/test/stdout/4020 @@ -7,7 +7,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
@@ -18,7 +18,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
******** SERVER ******** diff --git a/test/stdout/4021 b/test/stdout/4021 index 5e8877da4..40d99b05c 100644 --- a/test/stdout/4021 +++ b/test/stdout/4021 @@ -7,7 +7,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
@@ -18,7 +18,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
******** SERVER ******** diff --git a/test/stdout/4027 b/test/stdout/4027 index 79950e97f..be14c3534 100644 --- a/test/stdout/4027 +++ b/test/stdout/4027 @@ -7,7 +7,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
@@ -18,7 +18,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
@@ -29,7 +29,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 myhost.test.ex closing connection
******** SERVER ******** diff --git a/test/stdout/4030 b/test/stdout/4030 index d6dcda718..5bfbdf538 100644 --- a/test/stdout/4030 +++ b/test/stdout/4030 @@ -19,7 +19,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> body >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> QUIT ??? 221 <<< 221 myhost.test.ex closing connection @@ -46,7 +46,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected >>> body >>> . ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> QUIT ??? 221 <<< 221 myhost.test.ex closing connection @@ -73,7 +73,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected >>> body >>> . ??? 250 -<<< 250 OK id=10HmaZ-0005vi-00 +<<< 250 OK id=10HmaZ-000000005vi-0000 >>> QUIT ??? 221 <<< 221 myhost.test.ex closing connection diff --git a/test/stdout/4031 b/test/stdout/4031 index d53009cc1..1c697238d 100644 --- a/test/stdout/4031 +++ b/test/stdout/4031 @@ -9,7 +9,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -25,7 +25,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -41,7 +41,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/4033 b/test/stdout/4033 index 546ca8b1a..0e729668e 100644 --- a/test/stdout/4033 +++ b/test/stdout/4033 @@ -13,7 +13,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -42,7 +42,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -56,7 +56,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/4050 b/test/stdout/4050 index 00dd50200..ebf4cf7df 100644 --- a/test/stdout/4050 +++ b/test/stdout/4050 @@ -126,7 +126,7 @@ Connecting to 127.0.0.1 port 1225 ... connected <<< 354 Enter message, ending with "." on a line by itself >>> . ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> QUIT ??? 221 <<< 221 the.local.host.name closing connection diff --git a/test/stdout/4052 b/test/stdout/4052 index 63a12c926..541164ca2 100644 --- a/test/stdout/4052 +++ b/test/stdout/4052 @@ -18,10 +18,10 @@ Connection request from [127.0.0.1] >354 data go-ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmbD-0005vi-00 + id 10HmbD-000000005vi-0000 for nocache2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbD-0005vi-00@the.local.host.name> +Message-Id: <E10HmbD-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -48,10 +48,10 @@ Connection request from [127.0.0.1] >354 data go-ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmbE-0005vi-00 + id 10HmbE-000000005vi-0000 for withcache2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbE-0005vi-00@the.local.host.name> +Message-Id: <E10HmbE-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -94,10 +94,10 @@ Connection request from [127.0.0.1] >354 data go-ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmbG-0005vi-00 + id 10HmbG-000000005vi-0000 for nocache3@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbG-0005vi-00@the.local.host.name> +Message-Id: <E10HmbG-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -124,10 +124,10 @@ Connection request from [127.0.0.1] >354 data go-ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmbH-0005vi-00 + id 10HmbH-000000005vi-0000 for withcache3@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbH-0005vi-00@the.local.host.name> +Message-Id: <E10HmbH-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -212,10 +212,10 @@ Connection request from [127.0.0.1] >354 data go-ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmbO-0005vi-00 + id 10HmbO-000000005vi-0000 for withcache23@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbO-0005vi-00@the.local.host.name> +Message-Id: <E10HmbO-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -243,10 +243,10 @@ Connection request from [127.0.0.1] >354 data go-ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmbP-0005vi-00 + id 10HmbP-000000005vi-0000 for extchange@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbP-0005vi-00@the.local.host.name> +Message-Id: <E10HmbP-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/4056 b/test/stdout/4056 index 503457c54..24510ff71 100644 --- a/test/stdout/4056 +++ b/test/stdout/4056 @@ -1,2 +1,2 @@ -Message 10HmaY-0005vi-00 has been removed -Message 10HmbB-0005vi-00 has been removed +Message 10HmaY-000000005vi-0000 has been removed +Message 10HmbB-000000005vi-0000 has been removed diff --git a/test/stdout/4201 b/test/stdout/4201 index 9c95da74e..1d74546b1 100644 --- a/test/stdout/4201 +++ b/test/stdout/4201 @@ -28,7 +28,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> body >>> . ??? 250 -<<< 250 OK id=10HmaZ-0005vi-00 +<<< 250 OK id=10HmaZ-000000005vi-0000 >>> QUIT ??? 221 <<< 221 the.local.host.name closing connection @@ -63,7 +63,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> body >>> . ??? 250 -<<< 250 OK id=10HmbA-0005vi-00 +<<< 250 OK id=10HmbA-000000005vi-0000 >>> MAIL FROM: <ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com> SMTPUTF8 ??? 250 <<< 250 OK @@ -78,7 +78,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> body >>> . ??? 250 -<<< 250 OK id=10HmbB-0005vi-00 +<<< 250 OK id=10HmbB-000000005vi-0000 >>> QUIT ??? 221 <<< 221 the.local.host.name closing connection @@ -93,7 +93,7 @@ End of script 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
Connecting to 127.0.0.1 port 1225 ... connected ??? 220 diff --git a/test/stdout/4203 b/test/stdout/4203 index 59025e8d0..3a7c70957 100644 --- a/test/stdout/4203 +++ b/test/stdout/4203 @@ -8,5 +8,5 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
diff --git a/test/stdout/4204 b/test/stdout/4204 index 0f9825128..e770c1b92 100644 --- a/test/stdout/4204 +++ b/test/stdout/4204 @@ -8,7 +8,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
@@ -20,7 +20,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.ffail
diff --git a/test/stdout/4205 b/test/stdout/4205 index 94a4e18d7..17f63b9ce 100644 --- a/test/stdout/4205 +++ b/test/stdout/4205 @@ -8,5 +8,5 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
diff --git a/test/stdout/4206 b/test/stdout/4206 index 057ddb3aa..ad37ac936 100644 --- a/test/stdout/4206 +++ b/test/stdout/4206 @@ -8,7 +8,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
@@ -20,7 +20,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.sfail
diff --git a/test/stdout/4207 b/test/stdout/4207 index 34a2cfe36..c34032c63 100644 --- a/test/stdout/4207 +++ b/test/stdout/4207 @@ -8,7 +8,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
@@ -20,7 +20,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
@@ -32,5 +32,5 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
221 the.local.host.name closing connection
diff --git a/test/stdout/4211 b/test/stdout/4211 index 2dc813509..5056cda9e 100644 --- a/test/stdout/4211 +++ b/test/stdout/4211 @@ -30,7 +30,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> body >>> . ??? 250 -<<< 250 OK id=10HmaZ-0005vi-00 +<<< 250 OK id=10HmaZ-000000005vi-0000 >>> QUIT ??? 221 <<< 221 the.local.host.name closing connection @@ -67,7 +67,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> body >>> . ??? 250 -<<< 250 OK id=10HmbA-0005vi-00 +<<< 250 OK id=10HmbA-000000005vi-0000 >>> QUIT ??? 221 <<< 221 the.local.host.name closing connection @@ -83,5 +83,5 @@ End of script 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
diff --git a/test/stdout/4213 b/test/stdout/4213 index 3f5aaec6e..90b76e176 100644 --- a/test/stdout/4213 +++ b/test/stdout/4213 @@ -9,5 +9,5 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
diff --git a/test/stdout/4214 b/test/stdout/4214 index 211eedac7..f6838d0a6 100644 --- a/test/stdout/4214 +++ b/test/stdout/4214 @@ -9,7 +9,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
@@ -22,7 +22,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.ffail
diff --git a/test/stdout/4215 b/test/stdout/4215 index bef8cd347..d1afd34a8 100644 --- a/test/stdout/4215 +++ b/test/stdout/4215 @@ -9,5 +9,5 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
diff --git a/test/stdout/4216 b/test/stdout/4216 index fda7256be..2f33415f8 100644 --- a/test/stdout/4216 +++ b/test/stdout/4216 @@ -9,7 +9,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
@@ -22,7 +22,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.sfail
diff --git a/test/stdout/4221 b/test/stdout/4221 index 2dc813509..5056cda9e 100644 --- a/test/stdout/4221 +++ b/test/stdout/4221 @@ -30,7 +30,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> body >>> . ??? 250 -<<< 250 OK id=10HmaZ-0005vi-00 +<<< 250 OK id=10HmaZ-000000005vi-0000 >>> QUIT ??? 221 <<< 221 the.local.host.name closing connection @@ -67,7 +67,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> body >>> . ??? 250 -<<< 250 OK id=10HmbA-0005vi-00 +<<< 250 OK id=10HmbA-000000005vi-0000 >>> QUIT ??? 221 <<< 221 the.local.host.name closing connection @@ -83,5 +83,5 @@ End of script 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
diff --git a/test/stdout/4223 b/test/stdout/4223 index 3f5aaec6e..90b76e176 100644 --- a/test/stdout/4223 +++ b/test/stdout/4223 @@ -9,5 +9,5 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
diff --git a/test/stdout/4224 b/test/stdout/4224 index 211eedac7..f6838d0a6 100644 --- a/test/stdout/4224 +++ b/test/stdout/4224 @@ -9,7 +9,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
@@ -22,7 +22,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.ffail
diff --git a/test/stdout/4225 b/test/stdout/4225 index bef8cd347..d1afd34a8 100644 --- a/test/stdout/4225 +++ b/test/stdout/4225 @@ -9,5 +9,5 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
diff --git a/test/stdout/4226 b/test/stdout/4226 index fda7256be..2f33415f8 100644 --- a/test/stdout/4226 +++ b/test/stdout/4226 @@ -9,7 +9,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.bh
@@ -22,7 +22,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 the.local.host.name closing connection
220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-the.local.host.name Hello CALLER at client.sfail
diff --git a/test/stdout/4512 b/test/stdout/4512 index 0067c9ff0..8fbeabdca 100644 --- a/test/stdout/4512 +++ b/test/stdout/4512 @@ -38,7 +38,7 @@ Connecting to 127.0.0.1 port 1224 ... connected ??? 250- 557 <<< 250- 557 byte chunk, total 557 ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> QUIT ??? 221 <<< 221 testhost.test.ex closing connection @@ -86,7 +86,7 @@ Connecting to 127.0.0.1 port 1224 ... connected ??? 250- 32 <<< 250- 32 byte chunk, total 557 ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> QUIT ??? 221 <<< 221 testhost.test.ex closing connection diff --git a/test/stdout/4519 b/test/stdout/4519 index 9d64ae5f5..4d4f4650a 100644 --- a/test/stdout/4519 +++ b/test/stdout/4519 @@ -31,7 +31,7 @@ Connecting to 127.0.0.1 port 1224 ... connected >>> last line: 4 >>> . ??? 250 -<<< 250 OK id=10HmaZ-0005vi-00 +<<< 250 OK id=10HmaZ-000000005vi-0000 >>> QUIT ??? 221 <<< 221 testhost.test.ex closing connection @@ -68,7 +68,7 @@ Connecting to 127.0.0.1 port 1224 ... connected ??? 250- <<< 250- 129 byte chunk, total 129 ??? 250 -<<< 250 OK id=10HmbA-0005vi-00 +<<< 250 OK id=10HmbA-000000005vi-0000 >>> QUIT ??? 221 <<< 221 testhost.test.ex closing connection diff --git a/test/stdout/4532 b/test/stdout/4532 index 503b6ccc3..46c36cef8 100644 --- a/test/stdout/4532 +++ b/test/stdout/4532 @@ -48,7 +48,7 @@ Succeeded in starting TLS ??? 250- 557 <<< 250- 557 byte chunk, total 557 ??? 250 -<<< 250 OK id=10HmaX-0005vi-00 +<<< 250 OK id=10HmaX-000000005vi-0000 >>> QUIT ??? 221 <<< 221 testhost.test.ex closing connection @@ -106,7 +106,7 @@ Succeeded in starting TLS ??? 250- 32 <<< 250- 32 byte chunk, total 557 ??? 250 -<<< 250 OK id=10HmaY-0005vi-00 +<<< 250 OK id=10HmaY-000000005vi-0000 >>> QUIT ??? 221 <<< 221 testhost.test.ex closing connection diff --git a/test/stdout/4539 b/test/stdout/4539 index b766bb2e0..114d4f6ea 100644 --- a/test/stdout/4539 +++ b/test/stdout/4539 @@ -42,7 +42,7 @@ Succeeded in starting TLS >>> last line: 4 >>> . ??? 250 -<<< 250 OK id=10HmaZ-0005vi-00 +<<< 250 OK id=10HmaZ-000000005vi-0000 >>> QUIT ??? 221 <<< 221 testhost.test.ex closing connection @@ -90,7 +90,7 @@ Succeeded in starting TLS ??? 250- <<< 250- 161 byte chunk, total 161 ??? 250 -<<< 250 OK id=10HmbA-0005vi-00 +<<< 250 OK id=10HmbA-000000005vi-0000 >>> QUIT ??? 221 <<< 221 testhost.test.ex closing connection diff --git a/test/stdout/4711 b/test/stdout/4711 index 0a5c65dbd..785885a7d 100644 --- a/test/stdout/4711 +++ b/test/stdout/4711 @@ -22,9 +22,9 @@ DATA 352 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -49,9 +49,9 @@ DATA 352 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaY-0005vi-00; + id 10HmaY-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -67,9 +67,9 @@ DATA 352 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaY-0005vi-00; + id 10HmaY-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -83,9 +83,9 @@ DATA 352 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaY-0005vi-00; + id 10HmaY-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -110,9 +110,9 @@ DATA 352 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaZ-0005vi-00; + id 10HmaZ-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaZ-0005vi-00@the.local.host.name> +Message-Id: <E10HmaZ-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -126,9 +126,9 @@ DATA 352 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaZ-0005vi-00; + id 10HmaZ-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaZ-0005vi-00@the.local.host.name> +Message-Id: <E10HmaZ-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -153,9 +153,9 @@ DATA 352 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmbA-0005vi-00; + id 10HmbA-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbA-0005vi-00@the.local.host.name> +Message-Id: <E10HmbA-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -178,9 +178,9 @@ DATA 352 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmbA-0005vi-00; + id 10HmbA-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbA-0005vi-00@the.local.host.name> +Message-Id: <E10HmbA-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/4712 b/test/stdout/4712 index 56cd8571c..472cf3d96 100644 --- a/test/stdout/4712 +++ b/test/stdout/4712 @@ -14,9 +14,9 @@ DATA 352 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -30,9 +30,9 @@ DATA 352 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -55,9 +55,9 @@ DATA 352 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaY-0005vi-00; + id 10HmaY-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -80,9 +80,9 @@ DATA 352 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaY-0005vi-00; + id 10HmaY-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/4713 b/test/stdout/4713 index ac4fc02d4..08e08e323 100644 --- a/test/stdout/4713 +++ b/test/stdout/4713 @@ -16,9 +16,9 @@ DATA 352 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -43,9 +43,9 @@ DATA 352 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaY-0005vi-00; + id 10HmaY-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -61,9 +61,9 @@ DATA 352 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaY-0005vi-00; + id 10HmaY-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -77,9 +77,9 @@ DATA 352 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaY-0005vi-00; + id 10HmaY-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/4714 b/test/stdout/4714 index 207e19a4f..f01983e47 100644 --- a/test/stdout/4714 +++ b/test/stdout/4714 @@ -14,10 +14,10 @@ DATA 352 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 Subject: message 1 -Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -31,10 +31,10 @@ DATA 352 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 Subject: message 1 -Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -48,10 +48,10 @@ DATA 352 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaZ-0005vi-00; + id 10HmaZ-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 Subject: message 3 -Message-Id: <E10HmaZ-0005vi-00@the.local.host.name> +Message-Id: <E10HmaZ-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -65,10 +65,10 @@ DATA 352 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaZ-0005vi-00; + id 10HmaZ-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 Subject: message 3 -Message-Id: <E10HmaZ-0005vi-00@the.local.host.name> +Message-Id: <E10HmaZ-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -82,10 +82,10 @@ DATA 352 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaY-0005vi-00; + id 10HmaY-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 Subject: message 2 -Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -108,10 +108,10 @@ DATA 352 go ahead Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaY-0005vi-00; + id 10HmaY-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 Subject: message 2 -Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/5102 b/test/stdout/5102 index 76c2ec6a9..7fdeb9998 100644 --- a/test/stdout/5102 +++ b/test/stdout/5102 @@ -13,10 +13,10 @@ DATA 334 send more Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -69,9 +69,9 @@ DATA 354 Send it Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbA-0005vi-00; + id 10HmbA-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/5201 b/test/stdout/5201 index 5a1059de1..0e3e5a0ac 100644 --- a/test/stdout/5201 +++ b/test/stdout/5201 @@ -1 +1 @@ -Message 10HmaX-0005vi-00 is now frozen +Message 10HmaX-000000005vi-0000 is now frozen diff --git a/test/stdout/5300 b/test/stdout/5300 index 1d697e438..9e7dc1fc0 100644 --- a/test/stdout/5300 +++ b/test/stdout/5300 @@ -3,7 +3,7 @@ x@[V4NET.9.8.7] host [V4NET.9.8.7] [V4NET.9.8.7] x@[127.0.0.1] router = r3, transport = t1 - 0m sss 10HmaX-0005vi-00 <y@[10.9.8.7]> + 0m 282 10HmaX-000000005vi-0000 <y@[10.9.8.7]> zz@test.ex 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stdout/5400 b/test/stdout/5400 index 1790e18c5..6089910b9 100644 --- a/test/stdout/5400 +++ b/test/stdout/5400 @@ -7,7 +7,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -18,7 +18,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -30,7 +30,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -41,7 +41,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -53,7 +53,7 @@ 550 Administrative prohibition
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -65,7 +65,7 @@ 250 Accepted
550 Administrative prohibition
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbC-0005vi-00
+250 OK id=10HmbC-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -77,7 +77,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbD-0005vi-00
+250 OK id=10HmbD-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -89,7 +89,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbE-0005vi-00
+250 OK id=10HmbE-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -101,7 +101,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbF-0005vi-00
+250 OK id=10HmbF-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -113,7 +113,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbG-0005vi-00
+250 OK id=10HmbG-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -124,7 +124,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbH-0005vi-00
+250 OK id=10HmbH-000000005vi-0000
221 myhost.test.ex closing connection
******** SERVER ******** @@ -142,10 +142,10 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -171,10 +171,10 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for userz@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -200,9 +200,9 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (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 X-hdr-rtr-new: +++ @@ -226,11 +226,11 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbA-0005vi-00 + id 10HmbA-000000005vi-0000 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-tpt: zzz -Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -268,10 +268,10 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbB-0005vi-00 + id 10HmbB-000000005vi-0000 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbB-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -309,10 +309,10 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbC-0005vi-00 + id 10HmbC-000000005vi-0000 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbC-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbC-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -360,9 +360,9 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (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 X-hdr-rtr-new: +++ @@ -386,9 +386,9 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (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 X-hdr-rtr-new: +++ @@ -414,9 +414,9 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbE-0005vi-00; + id 10HmbE-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbE-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbE-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -464,9 +464,9 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbF-0005vi-00; + id 10HmbF-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbF-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbF-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -490,9 +490,9 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbF-0005vi-00; + id 10HmbF-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbF-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbF-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -518,9 +518,9 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbG-0005vi-00; + id 10HmbG-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbG-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbG-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -543,11 +543,11 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbH-0005vi-00 + id 10HmbH-000000005vi-0000 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 Subject: singledot test -Message-Id: <E10HmbH-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbH-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ diff --git a/test/stdout/5401 b/test/stdout/5401 index 52f8d7a48..ffbb47b88 100644 --- a/test/stdout/5401 +++ b/test/stdout/5401 @@ -7,7 +7,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -30,7 +30,7 @@ 550 550 Not that one
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
******** SERVER ******** @@ -48,10 +48,10 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -111,10 +111,10 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/5402 b/test/stdout/5402 index 629aa4330..8b32d4ccd 100644 --- a/test/stdout/5402 +++ b/test/stdout/5402 @@ -16,7 +16,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
******** SERVER ******** @@ -46,10 +46,10 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for dest@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/5403 b/test/stdout/5403 index f9bcde823..e99e08231 100644 --- a/test/stdout/5403 +++ b/test/stdout/5403 @@ -12,7 +12,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
**** SMTP testing: that is not a real message id! @@ -31,7 +31,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
**** SMTP testing: that is not a real message id! diff --git a/test/stdout/5404 b/test/stdout/5404 index fc5058ae7..98a33314e 100644 --- a/test/stdout/5404 +++ b/test/stdout/5404 @@ -7,7 +7,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
******** SERVER ******** @@ -26,10 +26,10 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ diff --git a/test/stdout/5405 b/test/stdout/5405 index b78f2bce8..db542c353 100644 --- a/test/stdout/5405 +++ b/test/stdout/5405 @@ -7,7 +7,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -18,7 +18,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -29,7 +29,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -49,7 +49,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -60,7 +60,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -93,7 +93,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbD-0005vi-00
+250 OK id=10HmbD-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -125,10 +125,10 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for usera@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -188,10 +188,10 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbA-0005vi-00 + id 10HmbA-000000005vi-0000 for usere@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -215,10 +215,10 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbB-0005vi-00 + id 10HmbB-000000005vi-0000 for userf@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbB-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -242,10 +242,10 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbC-0005vi-00 + id 10HmbC-000000005vi-0000 for userg@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbC-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbC-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -269,10 +269,10 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbE-0005vi-00 + id 10HmbE-000000005vi-0000 for userj@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbE-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbE-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -294,10 +294,10 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbD-0005vi-00 + id 10HmbD-000000005vi-0000 for userh@domain.com; 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 X-hdr-rtr-new: +++ diff --git a/test/stdout/5406 b/test/stdout/5406 index e372141ec..054539740 100644 --- a/test/stdout/5406 +++ b/test/stdout/5406 @@ -7,11 +7,11 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaY-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -22,12 +22,12 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
250 OK
250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbA-0005vi-00
+250 OK id=10HmbA-000000005vi-0000
221 myhost.test.ex closing connection
******** SERVER ******** @@ -45,10 +45,10 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -72,10 +72,10 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for usery@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ @@ -100,10 +100,10 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaZ-0005vi-00 + id 10HmaZ-000000005vi-0000 for userx@domain.com; 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 X-hdr-rtr-new: +++ @@ -129,9 +129,9 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbA-0005vi-00; + id 10HmbA-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 X-hdr-rtr-new: +++ diff --git a/test/stdout/5407 b/test/stdout/5407 index d67b362be..79b92837f 100644 --- a/test/stdout/5407 +++ b/test/stdout/5407 @@ -8,7 +8,7 @@ 250 Accepted
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
******** SERVER ******** @@ -28,9 +28,9 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/5409 b/test/stdout/5409 index e7edb252e..bed9fccfe 100644 --- a/test/stdout/5409 +++ b/test/stdout/5409 @@ -7,7 +7,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
******** SERVER ******** @@ -25,11 +25,11 @@ DATA Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 Subject: test -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/5410 b/test/stdout/5410 index 365fe2502..2cd93d507 100644 --- a/test/stdout/5410 +++ b/test/stdout/5410 @@ -8,7 +8,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -20,7 +20,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -32,5 +32,5 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
221 myhost.test.ex closing connection
diff --git a/test/stdout/5420 b/test/stdout/5420 index 365fe2502..2cd93d507 100644 --- a/test/stdout/5420 +++ b/test/stdout/5420 @@ -8,7 +8,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+250 OK id=10HmaX-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -20,7 +20,7 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmaZ-000000005vi-0000
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at myhost.test.ex
@@ -32,5 +32,5 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbB-000000005vi-0000
221 myhost.test.ex closing connection
diff --git a/test/stdout/5500 b/test/stdout/5500 index 37294c24b..b6fb96e7a 100644 --- a/test/stdout/5500 +++ b/test/stdout/5500 @@ -40,7 +40,7 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 550 <<< 550 PRDR R=<userz@test.ex> refusal ??? 250 -<<< 250 id=10HmaY-0005vi-00 message accepted for some recipients +<<< 250 id=10HmaY-000000005vi-0000 message accepted for some recipients >>> quit ??? 221 <<< 221 myhost.test.ex closing connection @@ -115,7 +115,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> Sender: sender@some.where >>> . ??? 250 -<<< 250 OK id=10HmaZ-0005vi-00 +<<< 250 OK id=10HmaZ-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection @@ -157,7 +157,7 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 450 <<< 450 PRDR R=<usery@test.ex> temporary refusal ??? 250 -<<< 250 id=10HmbA-0005vi-00 message accepted for some recipients +<<< 250 id=10HmbA-000000005vi-0000 message accepted for some recipients >>> quit ??? 221 <<< 221 myhost.test.ex closing connection @@ -199,7 +199,7 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 550 <<< 550 PRDR R=<userz@test.ex> refusal ??? 550 -<<< 550 id=10HmbB-0005vi-00 message rejected for all recipients +<<< 550 id=10HmbB-000000005vi-0000 message rejected for all recipients >>> quit ??? 221 <<< 221 myhost.test.ex closing connection @@ -232,7 +232,7 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> Sender: sender@some.where >>> . ??? 250 -<<< 250 OK id=10HmbC-0005vi-00 +<<< 250 OK id=10HmbC-000000005vi-0000 >>> quit ??? 221 <<< 221 myhost.test.ex closing connection diff --git a/test/stdout/5510 b/test/stdout/5510 index 7d2ad816b..79d6431a1 100644 --- a/test/stdout/5510 +++ b/test/stdout/5510 @@ -17,9 +17,9 @@ DATA 300 gimme yer body Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <userx@test.ex>) - id 10HmaX-0005vi-00; + id 10HmaX-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex> From: userx@test.ex Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -49,9 +49,9 @@ DATA 300 gimme that body Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <userx@test.ex>) - id 10HmaY-0005vi-00; + id 10HmaY-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex> From: userx@test.ex Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -78,9 +78,9 @@ DATA 300 gimme yer body Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <userx@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: userx@test.ex Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -109,9 +109,9 @@ RCPT TO:<userq@test.ex> DATA 300 gimme yer body Received: from CALLER by myhost.test.ex with local (Exim x.yz) - id 10HmbA-0005vi-00; + id 10HmbA-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 Some message text. @@ -137,9 +137,9 @@ RCPT TO:<user5.2@test.ex> DATA 300 yeah baby Received: from CALLER by myhost.test.ex with local (Exim x.yz) - id 10HmbB-0005vi-00; + id 10HmbB-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbB-000000005vi-0000@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 text @@ -167,9 +167,9 @@ RCPT TO:<user6.2@test.ex> DATA 300 yeah baby Received: from CALLER by myhost.test.ex with local (Exim x.yz) - id 10HmbC-0005vi-00; + id 10HmbC-000000005vi-0000; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbC-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbC-000000005vi-0000@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 text @@ -196,9 +196,9 @@ RCPT TO:<user7.3@test.ex> DATA 300 go ahead Received: from CALLER by myhost.test.ex with local (Exim x.yz) - 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> Date: Tue, 2 Mar 1999 09:44:33 +0000 text @@ -225,10 +225,10 @@ RCPT TO:<user8.1@test.ex> DATA 300 go ahead Received: from CALLER by myhost.test.ex with local (Exim x.yz) - id 10HmbE-0005vi-00 + id 10HmbE-000000005vi-0000 for user8.1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbE-0005vi-00@myhost.test.ex> +Message-Id: <E10HmbE-000000005vi-0000@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 text diff --git a/test/stdout/5590 b/test/stdout/5590 index 1c22145fb..7df274423 100644 --- a/test/stdout/5590 +++ b/test/stdout/5590 @@ -43,7 +43,7 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 550 <<< 550 PRDR R=<bad2@test.ex> refusal ??? 250 -<<< 250 id=10HmaX-0005vi-00 message accepted for some recipients +<<< 250 id=10HmaX-000000005vi-0000 message accepted for some recipients >>> QUIT ??? 221 <<< 221 testhost.test.ex closing connection diff --git a/test/stdout/5591 b/test/stdout/5591 index 6d4524515..a5d8dc6cd 100644 --- a/test/stdout/5591 +++ b/test/stdout/5591 @@ -14,7 +14,7 @@ RCPT TO:<usery@testhost.test.ex> 250 OK RCPT TO:<userz@testhost.test.ex> 250 OK -BDAT 287 LAST +BDAT 301 LAST 353 prdr responses coming up 250 first rcpt was good 250 second rcpt was good diff --git a/test/stdout/5700 b/test/stdout/5700 index f1ae127fd..6160c4384 100644 --- a/test/stdout/5700 +++ b/test/stdout/5700 @@ -1,6 +1,6 @@ -Message 10HmbF-0005vi-00 has been removed -Message 10HmbG-0005vi-00 has been modified -Message 10HmbG-0005vi-00 has been removed +Message 10HmbF-000000005vi-0000 has been removed +Message 10HmbG-000000005vi-0000 has been modified +Message 10HmbG-000000005vi-0000 has been removed ******** SERVER ******** Listening on port 1224 ... @@ -17,10 +17,10 @@ DATA 354 More... Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-0000 for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaY-0005vi-00@the.local.host.name> +Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -44,10 +44,10 @@ DATA 354 More... Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@expansionfail; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -103,10 +103,10 @@ DATA 354 Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmbC-0005vi-00 + id 10HmbC-000000005vi-0000 for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmbC-0005vi-00@the.local.host.name> +Message-Id: <E10HmbC-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/5702 b/test/stdout/5702 index 09fd602b7..590e16ef2 100644 --- a/test/stdout/5702 +++ b/test/stdout/5702 @@ -16,10 +16,10 @@ DATA 354 More... Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from <CALLER@the.local.host.name>) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/5820 b/test/stdout/5820 index 34ef2bd41..1958af7cc 100644 --- a/test/stdout/5820 +++ b/test/stdout/5820 @@ -20,8 +20,8 @@ ### A server where the A is dnssec and the TLSA lookup _fails_ (delivery should defer) ### A server securely saying "no TLSA records here", dane required (delivery should fail) ### A server securely saying "no TLSA records here", dane requested only (should deliver) -Message 10HmbH-0005vi-00 has been removed -Message 10HmbK-0005vi-00 has been removed +Message 10HmbH-000000005vi-0000 has been removed +Message 10HmbK-000000005vi-0000 has been removed ### A server securely serving a wrong TLSA record, dane requested only (delivery should fail) ### A server insecurely serving a good TLSA record, dane requested only (should deliver, non-DANE) ### A server insecurely serving a good TLSA record, dane required (delivery should fail) diff --git a/test/stdout/5840 b/test/stdout/5840 index 13ff736dd..342969b46 100644 --- a/test/stdout/5840 +++ b/test/stdout/5840 @@ -21,8 +21,8 @@ ### A server where the A is dnssec and the TLSA lookup _fails_ (delivery should defer) ### A server securely saying "no TLSA records here", dane required (delivery should fail) ### A server securely saying "no TLSA records here", dane requested only (should deliver) -Message 10HmbJ-0005vi-00 has been removed -Message 10HmbM-0005vi-00 has been removed +Message 10HmbJ-000000005vi-0000 has been removed +Message 10HmbM-000000005vi-0000 has been removed ### A server securely serving a wrong TLSA record, dane requested only (delivery should fail) ### A server insecurely serving a good TLSA record, dane requested only (should deliver, non-DANE) ### A server insecurely serving a good TLSA record, dane required (delivery should fail) diff --git a/test/stdout/5902 b/test/stdout/5902 index 8da182d51..9da73d6fb 100644 --- a/test/stdout/5902 +++ b/test/stdout/5902 @@ -1,2 +1,2 @@ -10HmaX-0005vi-00-D -10HmaX-0005vi-00-H +10HmaX-000000005vi-0000-D +10HmaX-000000005vi-0000-H |