Fix ${tr...} and empty-strings. Bug 3023

[exim.git] / test / stdout / 3415

diff --git a/test/stdout/3415 b/test/stdout/3415
index 11060a1b9e831e037a5c6f3dec2129716b779309..6631174a9f55182b186bd4579c725e67e26c61f8 100644 (file)
--- 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