DMARC: fix reporting, ARC-support but not in message

[exim.git] / test / stdout / 4003

diff --git a/test/stdout/4003 b/test/stdout/4003
index 5c16c636ae86a2ecd9b12c882c36372ba0ddac66..333ef2e4fa6c947ce2927c72fd828e735e8c57ce 100644 (file)
--- a/test/stdout/4003
+++ b/test/stdout/4003
@@ -7,7 +7,7 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaX-0005vi-00\r
+250 OK id=10HmaX-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 fromuser at test.ex\r
@@ -18,7 +18,7 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmaY-0005vi-00\r
+250 OK id=10HmaY-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 fromuser at test.ex\r
@@ -29,7 +29,7 @@
 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 fromuser at test.ex\r
@@ -40,7 +40,7 @@
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
-250 OK id=10HmbA-0005vi-00\r
+250 OK id=10HmbA-000000005vi-0000\r
 221 myhost.test.ex closing connection\r
 
 ******** SERVER ********
@@ -56,10 +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
-<      for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+<      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
 <
@@ -100,10 +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
-<      for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+<      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
 <
@@ -145,10 +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
-<      for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+<      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
 <
@@ -189,10 +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
-<      for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+<      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
 <