X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/2709ca2632f61d2ebcdf5ef2040b5b7068fd6a96..be5901583f97a754fe1b66d7f726107ec22636ad:/test/stdout/0190

diff --git a/test/stdout/0190 b/test/stdout/0190
index fa9ad7c5a..02bb8ca95 100644
--- a/test/stdout/0190
+++ b/test/stdout/0190
@@ -1,114 +1,114 @@
 x@x
   router = others, transport = smtp2
-  host V4NET.0.0.3 [V4NET.0.0.3] 
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.1 [V4NET.0.0.1] 
+  host V4NET.0.0.3 [V4NET.0.0.3]
+  host V4NET.0.0.2 [V4NET.0.0.2]
+  host V4NET.0.0.1 [V4NET.0.0.1]
 x@y
   router = others, transport = smtp2
-  host V4NET.0.0.1 [V4NET.0.0.1] 
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.3 [V4NET.0.0.3] 
+  host V4NET.0.0.1 [V4NET.0.0.1]
+  host V4NET.0.0.2 [V4NET.0.0.2]
+  host V4NET.0.0.3 [V4NET.0.0.3]
 x@z
   router = others, transport = smtp2
-  host V4NET.0.0.3 [V4NET.0.0.3] 
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.1 [V4NET.0.0.1] 
+  host V4NET.0.0.3 [V4NET.0.0.3]
+  host V4NET.0.0.2 [V4NET.0.0.2]
+  host V4NET.0.0.1 [V4NET.0.0.1]
 x@batch
   router = batched, transport = smtp2
-  host V4NET.0.0.3 [V4NET.0.0.3] 
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.1 [V4NET.0.0.1] 
-  host V4NET.0.0.4 [V4NET.0.0.4] 
-  host V4NET.0.0.5 [V4NET.0.0.5] 
-  host V4NET.0.0.6 [V4NET.0.0.6] 
-  host V4NET.0.0.7 [V4NET.0.0.7] 
+  host V4NET.0.0.3 [V4NET.0.0.3]
+  host V4NET.0.0.2 [V4NET.0.0.2]
+  host V4NET.0.0.1 [V4NET.0.0.1]
+  host V4NET.0.0.4 [V4NET.0.0.4]
+  host V4NET.0.0.5 [V4NET.0.0.5]
+  host V4NET.0.0.6 [V4NET.0.0.6]
+  host V4NET.0.0.7 [V4NET.0.0.7]
 y@batch
   router = batched, transport = smtp2
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.1 [V4NET.0.0.1] 
-  host V4NET.0.0.3 [V4NET.0.0.3] 
-  host V4NET.0.0.6 [V4NET.0.0.6] 
-  host V4NET.0.0.4 [V4NET.0.0.4] 
-  host V4NET.0.0.5 [V4NET.0.0.5] 
-  host V4NET.0.0.7 [V4NET.0.0.7] 
+  host V4NET.0.0.2 [V4NET.0.0.2]
+  host V4NET.0.0.1 [V4NET.0.0.1]
+  host V4NET.0.0.3 [V4NET.0.0.3]
+  host V4NET.0.0.6 [V4NET.0.0.6]
+  host V4NET.0.0.4 [V4NET.0.0.4]
+  host V4NET.0.0.5 [V4NET.0.0.5]
+  host V4NET.0.0.7 [V4NET.0.0.7]
 z@batch
   router = batched, transport = smtp2
-  host V4NET.0.0.1 [V4NET.0.0.1] 
-  host V4NET.0.0.3 [V4NET.0.0.3] 
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.5 [V4NET.0.0.5] 
-  host V4NET.0.0.4 [V4NET.0.0.4] 
-  host V4NET.0.0.6 [V4NET.0.0.6] 
-  host V4NET.0.0.7 [V4NET.0.0.7] 
+  host V4NET.0.0.1 [V4NET.0.0.1]
+  host V4NET.0.0.3 [V4NET.0.0.3]
+  host V4NET.0.0.2 [V4NET.0.0.2]
+  host V4NET.0.0.5 [V4NET.0.0.5]
+  host V4NET.0.0.4 [V4NET.0.0.4]
+  host V4NET.0.0.6 [V4NET.0.0.6]
+  host V4NET.0.0.7 [V4NET.0.0.7]
 x@batch2
   router = batched, transport = smtp2
-  host V4NET.0.0.1 [V4NET.0.0.1] 
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.3 [V4NET.0.0.3] 
-  host V4NET.0.0.4 [V4NET.0.0.4] 
-  host V4NET.0.0.5 [V4NET.0.0.5] 
-  host V4NET.0.0.6 [V4NET.0.0.6] 
-  host V4NET.0.0.7 [V4NET.0.0.7] 
+  host V4NET.0.0.1 [V4NET.0.0.1]
+  host V4NET.0.0.2 [V4NET.0.0.2]
+  host V4NET.0.0.3 [V4NET.0.0.3]
+  host V4NET.0.0.4 [V4NET.0.0.4]
+  host V4NET.0.0.5 [V4NET.0.0.5]
+  host V4NET.0.0.6 [V4NET.0.0.6]
+  host V4NET.0.0.7 [V4NET.0.0.7]
 y@batch2
   router = batched, transport = smtp2
-  host V4NET.0.0.1 [V4NET.0.0.1] 
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.3 [V4NET.0.0.3] 
-  host V4NET.0.0.4 [V4NET.0.0.4] 
-  host V4NET.0.0.5 [V4NET.0.0.5] 
-  host V4NET.0.0.6 [V4NET.0.0.6] 
-  host V4NET.0.0.7 [V4NET.0.0.7] 
+  host V4NET.0.0.1 [V4NET.0.0.1]
+  host V4NET.0.0.2 [V4NET.0.0.2]
+  host V4NET.0.0.3 [V4NET.0.0.3]
+  host V4NET.0.0.4 [V4NET.0.0.4]
+  host V4NET.0.0.5 [V4NET.0.0.5]
+  host V4NET.0.0.6 [V4NET.0.0.6]
+  host V4NET.0.0.7 [V4NET.0.0.7]
 x@batch3
   router = batched2, transport = smtp2
-  host V4NET.0.0.1 [V4NET.0.0.1] 
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.3 [V4NET.0.0.3] 
-  host V4NET.0.0.4 [V4NET.0.0.4] 
-  host V4NET.0.0.5 [V4NET.0.0.5] 
-  host V4NET.0.0.6 [V4NET.0.0.6] 
-  host V4NET.0.0.7 [V4NET.0.0.7] 
+  host V4NET.0.0.1 [V4NET.0.0.1]
+  host V4NET.0.0.2 [V4NET.0.0.2]
+  host V4NET.0.0.3 [V4NET.0.0.3]
+  host V4NET.0.0.4 [V4NET.0.0.4]
+  host V4NET.0.0.5 [V4NET.0.0.5]
+  host V4NET.0.0.6 [V4NET.0.0.6]
+  host V4NET.0.0.7 [V4NET.0.0.7]
 y@batch3
   router = batched2, transport = smtp2
-  host V4NET.0.0.1 [V4NET.0.0.1] 
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.3 [V4NET.0.0.3] 
-  host V4NET.0.0.4 [V4NET.0.0.4] 
-  host V4NET.0.0.5 [V4NET.0.0.5] 
-  host V4NET.0.0.6 [V4NET.0.0.6] 
-  host V4NET.0.0.7 [V4NET.0.0.7] 
+  host V4NET.0.0.1 [V4NET.0.0.1]
+  host V4NET.0.0.2 [V4NET.0.0.2]
+  host V4NET.0.0.3 [V4NET.0.0.3]
+  host V4NET.0.0.4 [V4NET.0.0.4]
+  host V4NET.0.0.5 [V4NET.0.0.5]
+  host V4NET.0.0.6 [V4NET.0.0.6]
+  host V4NET.0.0.7 [V4NET.0.0.7]
 x@batch4
   router = batched2, transport = smtp2
-  host V4NET.0.0.1 [V4NET.0.0.1] 
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.3 [V4NET.0.0.3] 
-  host V4NET.0.0.5 [V4NET.0.0.5] 
-  host V4NET.0.0.4 [V4NET.0.0.4] 
-  host V4NET.0.0.6 [V4NET.0.0.6] 
-  host V4NET.0.0.7 [V4NET.0.0.7] 
+  host V4NET.0.0.1 [V4NET.0.0.1]
+  host V4NET.0.0.2 [V4NET.0.0.2]
+  host V4NET.0.0.3 [V4NET.0.0.3]
+  host V4NET.0.0.5 [V4NET.0.0.5]
+  host V4NET.0.0.4 [V4NET.0.0.4]
+  host V4NET.0.0.6 [V4NET.0.0.6]
+  host V4NET.0.0.7 [V4NET.0.0.7]
 y@batch4
   router = batched2, transport = smtp2
-  host V4NET.0.0.2 [V4NET.0.0.2] 
-  host V4NET.0.0.1 [V4NET.0.0.1] 
-  host V4NET.0.0.3 [V4NET.0.0.3] 
-  host V4NET.0.0.5 [V4NET.0.0.5] 
-  host V4NET.0.0.6 [V4NET.0.0.6] 
-  host V4NET.0.0.4 [V4NET.0.0.4] 
-  host V4NET.0.0.7 [V4NET.0.0.7] 
+  host V4NET.0.0.2 [V4NET.0.0.2]
+  host V4NET.0.0.1 [V4NET.0.0.1]
+  host V4NET.0.0.3 [V4NET.0.0.3]
+  host V4NET.0.0.5 [V4NET.0.0.5]
+  host V4NET.0.0.6 [V4NET.0.0.6]
+  host V4NET.0.0.4 [V4NET.0.0.4]
+  host V4NET.0.0.7 [V4NET.0.0.7]
 userx@bdomain1
   router = r3, transport = smtp2
-  host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] 
-  host 127.0.0.1 [127.0.0.1]      
-  host the.local.host.name [ip4.ip4.ip4.ip4] 
+  host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]
+  host 127.0.0.1 [127.0.0.1]
+  host the.local.host.name [ip4.ip4.ip4.ip4]
 userx@bdomain2
   router = r3, transport = smtp2
-  host the.local.host.name [ip4.ip4.ip4.ip4] 
-  host 127.0.0.1 [127.0.0.1]      
-  host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] 
+  host the.local.host.name [ip4.ip4.ip4.ip4]
+  host 127.0.0.1 [127.0.0.1]
+  host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]
 userx@bdomain3
   router = r3, transport = smtp2
-  host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] 
-  host 127.0.0.1 [127.0.0.1]      
-  host the.local.host.name [ip4.ip4.ip4.ip4] 
+  host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]
+  host 127.0.0.1 [127.0.0.1]
+  host the.local.host.name [ip4.ip4.ip4.ip4]
 
 ******** SERVER ********
 Listening on port 1224 ... 
@@ -125,10 +125,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; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+	id 10HmaX-000000005vi-0000;
+	Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 .
@@ -150,10 +151,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; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+	id 10HmaX-000000005vi-0000;
+	Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 .
@@ -175,10 +177,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; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+	id 10HmaX-000000005vi-0000;
+	Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 .
@@ -202,10 +205,11 @@ 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; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+	id 10HmaY-000000005vi-0000;
+	Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 .
@@ -227,10 +231,11 @@ 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; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+	id 10HmaY-000000005vi-0000;
+	Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 .
@@ -256,10 +261,11 @@ 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; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+	id 10HmaZ-000000005vi-0000;
+	Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-000000005vi-0000@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 .