X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/766c0c47840bcf05df030d33ae49ce90b2dab855..97561a44e95fc17b7e4b74e22258cc1fd9c823d1:/test/stdout/4052?ds=inline

diff --git a/test/stdout/4052 b/test/stdout/4052
index 84e21e293..541164ca2 100644
--- a/test/stdout/4052
+++ b/test/stdout/4052
@@ -8,7 +8,7 @@ Connection request from [127.0.0.1]
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250 mail-from accepted
@@ -18,9 +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
-	for nocache2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
+	id 10HmbD-000000005vi-0000
+	for nocache2@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
+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
 
@@ -37,7 +38,7 @@ Connection request from [127.0.0.1]
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250 mail-from accepted
@@ -47,9 +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
-	for withcache2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
+	id 10HmbE-000000005vi-0000
+	for withcache2@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
+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
 
@@ -82,7 +84,7 @@ Connection request from [127.0.0.1]
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250 mail-from accepted
@@ -92,9 +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
-	for nocache3@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
+	id 10HmbG-000000005vi-0000
+	for nocache3@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
+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
 
@@ -111,7 +114,7 @@ Connection request from [127.0.0.1]
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250 mail-from accepted
@@ -121,9 +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
-	for withcache3@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
+	id 10HmbH-000000005vi-0000
+	for withcache3@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
+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
 
@@ -144,7 +148,7 @@ Connection request from [127.0.0.1]
 >220 banner
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 >250 mail good
 >250 rcpt good
@@ -163,7 +167,7 @@ Connection request from [127.0.0.1]
 >220 banner
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 >250 mail good
 >550 rcpt refused
@@ -182,7 +186,7 @@ Connection request from [127.0.0.1]
 >220 banner
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 >550 mail cmd refused
 >550 rcpt cmd rejected - no valid mail
@@ -198,7 +202,7 @@ Connection request from [127.0.0.1]
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
+>250-PIPECONNECT
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250 mail-from accepted
@@ -208,9 +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
-	for withcache23@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbO-0005vi-00@the.local.host.name>
+	id 10HmbO-000000005vi-0000
+	for withcache23@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
+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
 
@@ -227,8 +232,8 @@ Connection request from [127.0.0.1]
 <EHLO the.local.host.name
 >250-esmtp-resp
 >250-PIPELINING
->250-X_PIPE_CONNECT
->250-STARTTLS
+>250-PIPECONNECT
+>250-SIZE
 >250 ok
 <MAIL FROM:<CALLER@the.local.host.name>
 >250 mail-from accepted
@@ -238,9 +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
-	for extchange@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbP-0005vi-00@the.local.host.name>
+	id 10HmbP-000000005vi-0000
+	for extchange@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
+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