DKIM: signing with t but no x timestamp. Bug 2851

[exim.git] / test / stdout / 4006

diff --git a/test/stdout/4006 b/test/stdout/4006
index b4a72b82625f89a8f46f5020d5594b85b39d960f..39339ba0252316f30c801bfd039f3bbeb5703ba5 100644 (file)
--- a/test/stdout/4006
+++ b/test/stdout/4006
@@ -7,7 +7,7 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmbB-0005vi-00\r
+250 OK id=10HmbB-000000005vi-0000\r

 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.ex\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.ex\r


@@ -51,7 +51,7 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmaZ-0005vi-00\r
+250 OK id=10HmaZ-000000005vi-0000\r

 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.ex\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.ex\r


@@ -62,7 +62,7 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmbC-0005vi-00\r
+250 OK id=10HmbC-000000005vi-0000\r

 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.ex\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.ex\r


@@ -73,25 +73,25 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmbD-0005vi-00\r
+250 OK id=10HmbD-000000005vi-0000\r

 221 myhost.test.ex closing connection\r
 
 ******** SERVER ********
 Listening on TESTSUITE/eximdir/clam_sock ... 
 Connection request
 221 myhost.test.ex closing connection\r
 
 ******** 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
 >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
 >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
 >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
 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
 >LF>scanned_file_name: OK
 Expected EOF read from client
 End of script


@@ -118,11 +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>)
 <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
-<      for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+<      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
 <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>
 <
 <
 <From: CALLER_NAME <CALLER@myhost.test.ex>
 <
 <