fix doubled logging of message_id

[exim.git] / test / stdout / 0250

diff --git a/test/stdout/0250 b/test/stdout/0250
index 30fc9dc444d2253e234db5ae0a1fa3b1ae9b5250..99f9e377ef70e24f183ad32da531c34a14398b1a 100644 (file)
--- a/test/stdout/0250
+++ b/test/stdout/0250
@@ -1,10 +1,13 @@
-10HmaX-0005vi-00-H
+10HmaX-000000005vi-0000-H
 CALLER UID GID
 <CALLER-rewritten@test.ex>
 ddddddddd 0
+-received_time_usec .uuuuuu
+-received_time_complete tttt.uuuuuu
 -ident CALLER
 -received_protocol local
 -body_linecount 0
+-max_received_linelength 19
 -auth_id CALLER
 -auth_sender CALLER@test.ex
 -allow_unqualified_recipient
@@ -17,23 +20,27 @@ SomeOne-rewritten@test.ex
 
 dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER-rewritten@test.ex>)
-       id 10HmaX-0005vi-00
-       for SomeOne-rewritten@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaX-000000005vi-0000
+       for SomeOne-rewritten@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 ddd* From: userx@test.ex
 dddF From: userx-rewritten@test.ex
-047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+054I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>
 ddd* X-rewrote-original-recipient: SomeOne@test.ex
 ddd* Sender: CALLER_NAME <CALLER@test.ex>
 dddS Sender: CALLER_NAME <CALLER-rewritten@test.ex>
 ddd* X-rewrote-sender: CALLER@test.ex
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000
-10HmaY-0005vi-00-H
+10HmaY-000000005vi-0000-H
 CALLER UID GID
 <CALLER-rewritten@test.ex>
 ddddddddd 0
+-received_time_usec .uuuuuu
+-received_time_complete tttt.uuuuuu
 -ident CALLER
 -received_protocol local
 -body_linecount 0
+-max_received_linelength 19
 -auth_id CALLER
 -auth_sender CALLER@test.ex
 -allow_unqualified_recipient
@@ -46,23 +53,27 @@ OtherOne-rewritten@test.ex
 
 dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER-rewritten@test.ex>)
-       id 10HmaY-0005vi-00
-       for OtherOne-rewritten@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaY-000000005vi-0000
+       for OtherOne-rewritten@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 ddd* From: usery@test.ex
 dddF From: usery-rewritten@test.ex
-047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+054I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex>
 ddd* X-rewrote-original-recipient: OtherOne@test.ex
 ddd* Sender: CALLER_NAME <CALLER@test.ex>
 dddS Sender: CALLER_NAME <CALLER-rewritten@test.ex>
 ddd* X-rewrote-sender: CALLER@test.ex
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000
-10HmaZ-0005vi-00-H
+10HmaZ-000000005vi-0000-H
 CALLER UID GID
 <CALLER-rewritten@test.ex>
 ddddddddd 0
+-received_time_usec .uuuuuu
+-received_time_complete tttt.uuuuuu
 -ident CALLER
 -received_protocol local
 -body_linecount 0
+-max_received_linelength 0
 -auth_id CALLER
 -auth_sender CALLER@test.ex
 -allow_unqualified_recipient
@@ -75,9 +86,10 @@ ThirdOne-rewritten@test.ex
 
 dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER-rewritten@test.ex>)
-       id 10HmaZ-0005vi-00
-       for ThirdOne-rewritten@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-047I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+       id 10HmaZ-000000005vi-0000
+       for ThirdOne-rewritten@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+054I Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex>
 ddd* X-rewrote-original-recipient: ThirdOne@test.ex
 ddd* From: CALLER_NAME <CALLER@test.ex>
 dddF From: CALLER_NAME <CALLER-rewritten@test.ex>