git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Rewrites: avoid a split log line when rewiting hits a malformed address. Bug 3160
[exim.git] / test / stderr / 0489
diff --git a/test/stderr/0489 b/test/stderr/0489
index f1e4ed2c51d817ef28ec5a46f88a0e5d5838a6c9..1c20a8b4b65ffd2f24c4286afbb88a0ea48c974e 100644 (file)
--- a/test/stderr/0489
+++ b/test/stderr/0489
@@ -12,20 +12,20 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
-I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
-F From: "Phil Q. Hazel" <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>
+ F From: "Phil Q. Hazel" <CALLER@myhost.test.ex>
+   Date: Tue, 2 Mar 1999 09:44:33 +0000
 
-Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
-Data file written for message 10HmaX-0005vi-00
+Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D
+Data file written for message 10HmaX-000000005vi-0000
 >>Generated Received: header line
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
-       id 10HmaX-0005vi-00
+       id 10HmaX-000000005vi-0000
        for X@myhost.test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
-Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00
-Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
+Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000
+Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
@@ -45,20 +45,20 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
-I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-F From: John "Jack" Smith <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex>
+ F From: John "Jack" Smith <CALLER@myhost.test.ex>
+   Date: Tue, 2 Mar 1999 09:44:33 +0000
 
-Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D
-Data file written for message 10HmaY-0005vi-00
+Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D
+Data file written for message 10HmaY-000000005vi-0000
 >>Generated Received: header line
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
-       id 10HmaY-0005vi-00
+       id 10HmaY-000000005vi-0000
        for X@myhost.test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
-Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
-Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
+Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000
+Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
@@ -77,20 +77,20 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
-I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
-F From: John "Jack" "Q." Smith <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ I Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex>
+ F From: John "Jack" "Q." Smith <CALLER@myhost.test.ex>
+   Date: Tue, 2 Mar 1999 09:44:33 +0000
 
-Data file name: TESTSUITE/spool//input//10HmaZ-0005vi-00-D
-Data file written for message 10HmaZ-0005vi-00
+Data file name: TESTSUITE/spool//input//10HmaZ-000000005vi-0000-D
+Data file written for message 10HmaZ-000000005vi-0000
 >>Generated Received: header line
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
-       id 10HmaZ-0005vi-00
+       id 10HmaZ-000000005vi-0000
        for X@myhost.test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
-Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-0005vi-00
-Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H
+Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-000000005vi-0000
+Renaming spool header file: TESTSUITE/spool//input//10HmaZ-000000005vi-0000-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
@@ -109,20 +109,20 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
-I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
-F From: "John (Jack) Q. Smith" <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ I Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex>
+ F From: "John (Jack) Q. Smith" <CALLER@myhost.test.ex>
+   Date: Tue, 2 Mar 1999 09:44:33 +0000
 
-Data file name: TESTSUITE/spool//input//10HmbA-0005vi-00-D
-Data file written for message 10HmbA-0005vi-00
+Data file name: TESTSUITE/spool//input//10HmbA-000000005vi-0000-D
+Data file written for message 10HmbA-000000005vi-0000
 >>Generated Received: header line
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
-       id 10HmbA-0005vi-00
+       id 10HmbA-000000005vi-0000
        for X@myhost.test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
-Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-0005vi-00
-Renaming spool header file: TESTSUITE/spool//input//10HmbA-0005vi-00-H
+Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-000000005vi-0000
+Renaming spool header file: TESTSUITE/spool//input//10HmbA-000000005vi-0000-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
@@ -141,20 +141,20 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
-I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
-F From: John ("Jack") "Q." Smith <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ I Message-Id: <E10HmbB-000000005vi-0000@myhost.test.ex>
+ F From: John ("Jack") "Q." Smith <CALLER@myhost.test.ex>
+   Date: Tue, 2 Mar 1999 09:44:33 +0000
 
-Data file name: TESTSUITE/spool//input//10HmbB-0005vi-00-D
-Data file written for message 10HmbB-0005vi-00
+Data file name: TESTSUITE/spool//input//10HmbB-000000005vi-0000-D
+Data file written for message 10HmbB-000000005vi-0000
 >>Generated Received: header line
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
-       id 10HmbB-0005vi-00
+       id 10HmbB-000000005vi-0000
        for X@myhost.test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
-Writing spool header file: TESTSUITE/spool//input//hdr.10HmbB-0005vi-00
-Renaming spool header file: TESTSUITE/spool//input//10HmbB-0005vi-00-H
+Writing spool header file: TESTSUITE/spool//input//hdr.10HmbB-000000005vi-0000
+Renaming spool header file: TESTSUITE/spool//input//10HmbB-000000005vi-0000-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
@@ -173,20 +173,20 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
-I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
-F From: "John (\"Jack\") Q. Smith" <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ I Message-Id: <E10HmbC-000000005vi-0000@myhost.test.ex>
+ F From: "John (\"Jack\") Q. Smith" <CALLER@myhost.test.ex>
+   Date: Tue, 2 Mar 1999 09:44:33 +0000
 
-Data file name: TESTSUITE/spool//input//10HmbC-0005vi-00-D
-Data file written for message 10HmbC-0005vi-00
+Data file name: TESTSUITE/spool//input//10HmbC-000000005vi-0000-D
+Data file written for message 10HmbC-000000005vi-0000
 >>Generated Received: header line
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
-       id 10HmbC-0005vi-00
+       id 10HmbC-000000005vi-0000
        for X@myhost.test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
-Writing spool header file: TESTSUITE/spool//input//hdr.10HmbC-0005vi-00
-Renaming spool header file: TESTSUITE/spool//input//10HmbC-0005vi-00-H
+Writing spool header file: TESTSUITE/spool//input//hdr.10HmbC-000000005vi-0000
+Renaming spool header file: TESTSUITE/spool//input//10HmbC-000000005vi-0000-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
@@ -205,20 +205,20 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
-I Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
-F From: "Phil \"Q Hazel" <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ I Message-Id: <E10HmbD-000000005vi-0000@myhost.test.ex>
+ F From: "Phil \"Q Hazel" <CALLER@myhost.test.ex>
+   Date: Tue, 2 Mar 1999 09:44:33 +0000
 
-Data file name: TESTSUITE/spool//input//10HmbD-0005vi-00-D
-Data file written for message 10HmbD-0005vi-00
+Data file name: TESTSUITE/spool//input//10HmbD-000000005vi-0000-D
+Data file written for message 10HmbD-000000005vi-0000
 >>Generated Received: header line
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
-       id 10HmbD-0005vi-00
+       id 10HmbD-000000005vi-0000
        for X@myhost.test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
-Writing spool header file: TESTSUITE/spool//input//hdr.10HmbD-0005vi-00
-Renaming spool header file: TESTSUITE/spool//input//10HmbD-0005vi-00-H
+Writing spool header file: TESTSUITE/spool//input//hdr.10HmbD-000000005vi-0000
+Renaming spool header file: TESTSUITE/spool//input//10HmbD-000000005vi-0000-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
@@ -237,20 +237,20 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
-I Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
-F From: "Phil \"Q" "X." Hazel <CALLER@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ I Message-Id: <E10HmbE-000000005vi-0000@myhost.test.ex>
+ F From: "Phil \"Q" "X." Hazel <CALLER@myhost.test.ex>
+   Date: Tue, 2 Mar 1999 09:44:33 +0000
 
-Data file name: TESTSUITE/spool//input//10HmbE-0005vi-00-D
-Data file written for message 10HmbE-0005vi-00
+Data file name: TESTSUITE/spool//input//10HmbE-000000005vi-0000-D
+Data file written for message 10HmbE-000000005vi-0000
 >>Generated Received: header line
 P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
-       id 10HmbE-0005vi-00
+       id 10HmbE-000000005vi-0000
        for X@myhost.test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
-Writing spool header file: TESTSUITE/spool//input//hdr.10HmbE-0005vi-00
-Renaming spool header file: TESTSUITE/spool//input//10HmbE-0005vi-00-H
+Writing spool header file: TESTSUITE/spool//input//hdr.10HmbE-000000005vi-0000
+Renaming spool header file: TESTSUITE/spool//input//10HmbE-000000005vi-0000-H
 Size of headers = sss
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
Master Exim source repository