With a few minor exceptions for tests that had additional concerns and tests I don...

diff --git a/test/log/5100 b/test/log/5100
index e11d37c0059f464704b3c8a09ba6e30dc1339df0..ec4a807ffa2413c623f1e3945aad413ae7805d43 100644 (file)
--- a/test/log/5100
+++ b/test/log/5100
@@ -72,10 +72,10 @@ DATA
 <<< Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 <<<    (envelope-from <CALLER@myhost.test.ex>)
 <<<    id 10HmbD-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-<<< Date: Tue, 2 Mar 1999 09:44:33 +0000
-<<< Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 <<< script: 05
+<<< Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 <<< From: CALLER_NAME <CALLER@myhost.test.ex>
+<<< Date: Tue, 2 Mar 1999 09:44:33 +0000
 <<< 
 <<< This is a test message.
 <<< .
@@ -129,10 +129,10 @@ DATA
 <<< Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 <<<    (envelope-from <CALLER@myhost.test.ex>)
 <<<    id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-<<< Date: Tue, 2 Mar 1999 09:44:33 +0000
-<<< Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
 <<< script: 06
+<<< Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
 <<< From: CALLER_NAME <CALLER@myhost.test.ex>
+<<< Date: Tue, 2 Mar 1999 09:44:33 +0000
 <<< 
 <<< This is a test message.
 <<< .
@@ -202,10 +202,10 @@ DATA
 <<< Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 <<<    (envelope-from <CALLER@myhost.test.ex>)
 <<<    id 10HmbI-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-<<< Date: Tue, 2 Mar 1999 09:44:33 +0000
-<<< Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
 <<< script: 08
+<<< Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
 <<< From: CALLER_NAME <CALLER@myhost.test.ex>
+<<< Date: Tue, 2 Mar 1999 09:44:33 +0000
 <<< 
 <<< This is a test message.
 <<< .
@@ -240,10 +240,10 @@ DATA
 <<< Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 <<<    (envelope-from <CALLER@myhost.test.ex>)
 <<<    id 10HmbJ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-<<< Date: Tue, 2 Mar 1999 09:44:33 +0000
-<<< Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
 <<< script: 09
+<<< Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
 <<< From: CALLER_NAME <CALLER@myhost.test.ex>
+<<< Date: Tue, 2 Mar 1999 09:44:33 +0000
 <<< 
 <<< This is a test message.
 <<< .

diff --git a/test/mail/0005.CALLER b/test/mail/0005.CALLER
index 0d795f63652998fc5a39b21494dbe84d34f728fd..1b73cc347922f71e8e082a412c7d35b2eb503f79 100644 (file)
--- a/test/mail/0005.CALLER
+++ b/test/mail/0005.CALLER
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        (envelope-from <someone@some.domain>)
        id 10HmaX-0005vi-00
        for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00.a-b-c-@some.domain>
 From: someone@some.domain
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-acl-message-linecount: 4
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 3
@@ -27,10 +27,10 @@ Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        (envelope-from <someone@some.domain>)
        id 10HmaY-0005vi-00
        for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00.a-b-c-@some.domain>
 Subject: second
+Message-Id: <E10HmaY-0005vi-00.a-b-c-@some.domain>
 From: someone@some.domain
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-acl-message-linecount: 3
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 1
@@ -47,11 +47,11 @@ Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        (envelope-from <someone@some.domain>)
        id 10HmaZ-0005vi-00
        for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00.a-b-c-@some.domain>
 Subject: third
 Reply-to: some@body
+Message-Id: <E10HmaZ-0005vi-00.a-b-c-@some.domain>
 From: someone@some.domain
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-acl-message-linecount: 4
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 1

diff --git a/test/mail/0008.CALLER b/test/mail/0008.CALLER
index 15ccf08caf0be1e3746f4ceee9426fd2cf216062..0a54f1f4d52dde18251c1b13bd3872c03e774c09 100644 (file)
--- a/test/mail/0008.CALLER
+++ b/test/mail/0008.CALLER
@@ -6,11 +6,11 @@ Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
        (envelope-from <someone@some.where>)
        id 10HmaX-0005vi-00
        for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 from: someone@some.where
 To: CALLER@the.local.host.name
 Subject: testing
 Message-id: abcd%rxyz@p.q.r
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Here is testing data
 .that line started with a dot

diff --git a/test/mail/0009.CALLER b/test/mail/0009.CALLER
index c6bc2c961f25e4efe5caea3d032f9934d8d8d445..b4806a18dfd8ea1b8860f618c41a314a9d3e1c48 100644 (file)
--- a/test/mail/0009.CALLER
+++ b/test/mail/0009.CALLER
@@ -6,11 +6,11 @@ Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
        (envelope-from <someone@some.where>)
        id 10HmaX-0005vi-00
        for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 from: someone@some.where
 To: CALLER@the.local.host.name
 Subject: testing
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Here is testing data
 .that line started with a dot

diff --git a/test/mail/0010.CALLER b/test/mail/0010.CALLER
index c6bc2c961f25e4efe5caea3d032f9934d8d8d445..b4806a18dfd8ea1b8860f618c41a314a9d3e1c48 100644 (file)
--- a/test/mail/0010.CALLER
+++ b/test/mail/0010.CALLER
@@ -6,11 +6,11 @@ Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
        (envelope-from <someone@some.where>)
        id 10HmaX-0005vi-00
        for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 from: someone@some.where
 To: CALLER@the.local.host.name
 Subject: testing
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Here is testing data
 .that line started with a dot

diff --git a/test/mail/0011.CALLER b/test/mail/0011.CALLER
index c6bc2c961f25e4efe5caea3d032f9934d8d8d445..b4806a18dfd8ea1b8860f618c41a314a9d3e1c48 100644 (file)
--- a/test/mail/0011.CALLER
+++ b/test/mail/0011.CALLER
@@ -6,11 +6,11 @@ Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
        (envelope-from <someone@some.where>)
        id 10HmaX-0005vi-00
        for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 from: someone@some.where
 To: CALLER@the.local.host.name
 Subject: testing
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Here is testing data
 .that line started with a dot

diff --git a/test/mail/0014.userx b/test/mail/0014.userx
index 956382bd326f7294ba054e14dd3bdfac8c228544..8844387dcb24719c6d79d6a8170fe0bccee9bf64 100644 (file)
--- a/test/mail/0014.userx
+++ b/test/mail/0014.userx
@@ -3,21 +3,21 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: aaa@bbb
 To: userx@myhost.test.ex, 1=x@zzery.query
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From J.Caesar@plc.example Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <J.Caesar@plc.example>)
        id 10HmaZ-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: J.Caesar@plc.example
 To: userx@myhost.test.ex, J.Caesar@plc.example,
   J.Calendar@plc.example,
   unknown@plc.example 
 Reply-to: J.Caesar@plc.example   
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 

diff --git a/test/mail/0015.CALLER b/test/mail/0015.CALLER
index f617ace68c6495e4accab3c6d96625939fca223f..2f531e675896e61fd70b9ba042efa2f067eea07b 100644 (file)
--- a/test/mail/0015.CALLER
+++ b/test/mail/0015.CALLER
@@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaZ-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 X-Failed-Recipients: page+userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: CALLER
 X-local_part_prefix: 
 
@@ -30,9 +30,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for page+userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Some message text.
 
@@ -43,13 +43,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbC-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 X-Failed-Recipients: page+userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: CALLER
 X-local_part_prefix: 
 
@@ -69,9 +69,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for page+ux@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Some more message text.
 

diff --git a/test/mail/0015.userx b/test/mail/0015.userx
index 2112b7100b100d7eb50ccdfaec94cc99ba8d3a51..29b1e9a9507a153ff1141ad1e756ada8f9615b06 100644 (file)
--- a/test/mail/0015.userx
+++ b/test/mail/0015.userx
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for page+userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: userx
 X-local_part_prefix: page+
 
@@ -21,13 +21,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 To: userx@test.ex
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
 References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: userx
 X-local_part_prefix: 
 
@@ -41,9 +41,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for page+ux@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: userx
 X-local_part_prefix: page+
 
@@ -56,13 +56,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmbB-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 To: userx@test.ex
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
 References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: userx
 X-local_part_prefix: 
 
@@ -78,9 +78,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbD-0005vi-00
        for B+userx@Test.Ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: userx
 X-local_part_prefix: b+
 
@@ -95,9 +95,9 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: userx
 X-local_part_prefix: 
 
@@ -111,9 +111,9 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local_part: userx
 X-local_part_prefix: x+
 

diff --git a/test/mail/0016.userx b/test/mail/0016.userx
index 3f0451c3ca45d9e43c82049498e199a161b4585d..8e33c3631b0d10193240245cf353c761a4132e68 100644 (file)
--- a/test/mail/0016.userx
+++ b/test/mail/0016.userx
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx+page@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Some message text.
 
@@ -19,13 +19,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 To: userx@test.ex
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
 References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 callpager -r 108 PAGE:Some message text. 
 

diff --git a/test/mail/0021.ok b/test/mail/0021.ok
index e29b128327fd734b9ec4ca24117f6f386cc385f4..213d0c60a3db27ff8d52f4c310d93f55817ef393 100644 (file)
--- a/test/mail/0021.ok
+++ b/test/mail/0021.ok
@@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmbE-0005vi-00
        for ok@test2; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: ok@test2
 Subject: Mail failure - rejected by local scanning code
+Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that
 checks incoming messages on this system. The following error was given:
@@ -20,9 +20,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <ok@test2>)
        id 10HmaY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: ok@test2
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 3.
 
@@ -30,12 +30,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmbG-0005vi-00
        for ok@test4; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: ok@test4
 Subject: Mail failure - rejected by local scanning code
+Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that
 checks incoming messages on this system. The following error was given:
@@ -48,9 +48,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <ok@test4>)
        id 10HmaZ-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: ok@test4
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 5.
 

diff --git a/test/mail/0021.userx b/test/mail/0021.userx
index b8b130f7620eff82ea61405e7f561bb8731b2c54..2abd8d3150adc6474e3b389cb3fcfacf84ee8021 100644 (file)
--- a/test/mail/0021.userx
+++ b/test/mail/0021.userx
@@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmbC-0005vi-00
        for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: userx@test1
 Subject: Mail failure - rejected by local scanning code
+Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that
 checks incoming messages on this system. The following error was given:
@@ -20,9 +20,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <userx@test1>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: userx@test1
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 1.
 
@@ -31,9 +31,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <ok@test1>)
        id 10HmbD-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 From: ok@test1
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 2.
 
@@ -42,9 +42,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <ok@test3>)
        id 10HmbF-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
 From: ok@test3
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 4.
 
@@ -52,12 +52,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmbI-0005vi-00
        for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: userx@test1
 Subject: Mail failure - rejected by local scanning code
+Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that
 checks incoming messages on this system. The following error was given:
@@ -68,12 +68,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmbJ-0005vi-00
        for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: userx@test1
 Subject: Mail failure - rejected by local scanning code
+Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that
 checks incoming messages on this system. The following error was given:
@@ -87,8 +87,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <userx@test1>)
        id 10HmbB-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: userx@test1
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 

diff --git a/test/mail/0025.userx b/test/mail/0025.userx
index 791a3266ae9915a1f17e4b79865823c3f6913577..791683ab7ef84121440bdc3de092b02d33aec9de 100644 (file)
--- a/test/mail/0025.userx
+++ b/test/mail/0025.userx
@@ -2,9 +2,9 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 1
 

diff --git a/test/mail/0026.userx b/test/mail/0026.userx
index c9a8874b48284753eaf252a784755060126dacc5..4c78221971d8fdce03010f9559713749e9ce97c1 100644 (file)
--- a/test/mail/0026.userx
+++ b/test/mail/0026.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmbE-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 From: x@y
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-warning: this is a test warning
 
 Message 7
@@ -15,11 +15,11 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmbF-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
 to: group name: x@y, p@q;
 reply-to: group name: a@b, c@d;
+Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
 From: x@y
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-warning: this is a test warning
 
 Message 10
@@ -28,11 +28,11 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmbG-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
 to: group name: x@y, p@q;
 reply-to: group name:;
 from: userx@test.ex
+Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-warning: this is a test warning
 
 Message 11

diff --git a/test/mail/0031.CALLER b/test/mail/0031.CALLER
index ef8774a37067cb511b31eacaf46e1886c4a7f1c4..d996dc047d0cac2089bdcd64b7c109101ec2499c 100644 (file)
--- a/test/mail/0031.CALLER
+++ b/test/mail/0031.CALLER
@@ -6,9 +6,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmaX-0005vi-00
        for CALLER@one.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 1.
 

diff --git a/test/mail/0032.CALLER b/test/mail/0032.CALLER
index 2c3c866be1c2846be274b630a2d6df4964ef424b..95051c4d9db850842e8c60bfff90ba326cb60dcc 100644 (file)
--- a/test/mail/0032.CALLER
+++ b/test/mail/0032.CALLER
@@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@myhost.ex>
 X-Failed-Recipients: userx@mxt1.test.ex
 Auto-Submitted: auto-replied
 From: MailProgram <xyz@some.where>
 To: CALLER@myhost.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmaY-0005vi-00@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -28,9 +28,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmaX-0005vi-00
        for userx@mxt1.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 

diff --git a/test/mail/0036.abcd b/test/mail/0036.abcd
index 63fc8aad90faaf860978ac686223e02910bc38df..1c9503859da2a3788c8b77cb9ca4f1af4d2a4c94 100644 (file)
--- a/test/mail/0036.abcd
+++ b/test/mail/0036.abcd
@@ -6,10 +6,10 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 To: userx@alias-eximtesthost.test.ex, abcd@eximtesthost.test.ex
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 

diff --git a/test/mail/0036.userx b/test/mail/0036.userx
index 63fc8aad90faaf860978ac686223e02910bc38df..1c9503859da2a3788c8b77cb9ca4f1af4d2a4c94 100644 (file)
--- a/test/mail/0036.userx
+++ b/test/mail/0036.userx
@@ -6,10 +6,10 @@ Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 To: userx@alias-eximtesthost.test.ex, abcd@eximtesthost.test.ex
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 

diff --git a/test/mail/0037.CALLER b/test/mail/0037.CALLER
index d3aa4fbff19ffff829c7cfbb8808d3ad7ba5bfd4..93711697d4a08f7230e26b326d44731045858c70 100644 (file)
--- a/test/mail/0037.CALLER
+++ b/test/mail/0037.CALLER
@@ -5,8 +5,6 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaZ-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 X-Failed-Recipients: usery@test.ex,
   abcd@test.ex,
   userx@test.ex
@@ -14,6 +12,8 @@ Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -33,10 +33,10 @@ Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 Subject: should fail this
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Fail this.
@@ -48,14 +48,14 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmbD-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 To: CALLER@test.ex
 Subject: An auto reply: qualify_domain=test.ex
 In-Reply-To: <E10HmbC-0005vi-00@the.local.host.name>
 References: <E10HmbC-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: CALLER@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a text line
 
@@ -66,13 +66,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbF-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 X-Failed-Recipients: filter-pipe@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -89,10 +89,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbE-0005vi-00
        for filter-pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
 Subject: should give filter error (1)
+Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 
@@ -103,13 +103,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbH-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
 X-Failed-Recipients: filter-file@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -126,10 +126,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbG-0005vi-00
        for filter-file@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
 Subject: should give filter error (2)
+Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 
@@ -140,13 +140,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbJ-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbJ-0005vi-00@the.local.host.name>
 X-Failed-Recipients: filter-lookup@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbJ-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -163,10 +163,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbI-0005vi-00
        for filter-lookup@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbI-0005vi-00@the.local.host.name>
 Subject: should give filter error (3)
+Message-Id: <E10HmbI-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 
@@ -177,13 +177,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbL-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbL-0005vi-00@the.local.host.name>
 X-Failed-Recipients: filter-exists@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbL-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -200,10 +200,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbK-0005vi-00
        for filter-exists@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbK-0005vi-00@the.local.host.name>
 Subject: should give filter error (4)
+Message-Id: <E10HmbK-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 
@@ -214,13 +214,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbN-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbN-0005vi-00@the.local.host.name>
 X-Failed-Recipients: filter-readfile@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbN-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -237,10 +237,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbM-0005vi-00
        for filter-readfile@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbM-0005vi-00@the.local.host.name>
 Subject: should give filter error (5)
+Message-Id: <E10HmbM-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 
@@ -251,13 +251,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbP-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbP-0005vi-00@the.local.host.name>
 X-Failed-Recipients: filter-run@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbP-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -274,10 +274,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbO-0005vi-00
        for filter-run@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbO-0005vi-00@the.local.host.name>
 Subject: should give filter error (6)
+Message-Id: <E10HmbO-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 
@@ -288,14 +288,14 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmbR-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbR-0005vi-00@the.local.host.name>
 To: CALLER_NAME <CALLER@test.ex>
 Subject: On vacation
 In-Reply-To: <E10HmbQ-0005vi-00@the.local.host.name>
 References: <E10HmbQ-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmbR-0005vi-00@the.local.host.name>
 From: CALLER@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 this is vacation text
 
@@ -306,13 +306,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbV-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbV-0005vi-00@the.local.host.name>
 X-Failed-Recipients: readfile@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbV-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -329,9 +329,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbU-0005vi-00
        for readfile@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbU-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Should fail ${readfile in filter.
@@ -343,13 +343,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmcB-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmcB-0005vi-00@the.local.host.name>
 X-Failed-Recipients: filter-stat@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmcB-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -366,10 +366,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmcA-0005vi-00
        for filter-stat@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmcA-0005vi-00@the.local.host.name>
 Subject: should give filter error (7)
+Message-Id: <E10HmcA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 
@@ -380,13 +380,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmcD-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmcD-0005vi-00@the.local.host.name>
 To: CALLER_NAME <CALLER@test.ex>
 Subject: Re: Very long ... xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 In-Reply-To: <E10HmcC-0005vi-00@the.local.host.name>
 References: <E10HmcC-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmcD-0005vi-00@the.local.host.name>
 From: CALLER@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 

diff --git a/test/mail/0037.dff b/test/mail/0037.dff
index a57f4833d46e73d1780a98d3e614f45d07440ecc..cf539f85edecb9c3696bba9b7325b3e12118eaeb 100644 (file)
--- a/test/mail/0037.dff
+++ b/test/mail/0037.dff
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbW-0005vi-00
        for deliverfromfilter@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbW-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 original_domain=test.ex
   original_local_part=system-filter
   parent_domain=test.ex

diff --git a/test/mail/0037.postmaster b/test/mail/0037.postmaster
index 90b2408e49b1292a5013f78d91dd1b457b2d1e77..f7c2aea5095d59544037ed4d938dbe786cbfb51f 100644 (file)
--- a/test/mail/0037.postmaster
+++ b/test/mail/0037.postmaster
@@ -5,12 +5,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbB-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: Message frozen
+Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 10HmbA-0005vi-00 has been frozen by the system filter.
 subject was "should freeze this" 
@@ -28,12 +28,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbT-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbT-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: Message frozen
+Message-Id: <E10HmbT-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 10HmbS-0005vi-00 has been frozen by the system filter.
 subject was "should freeze this" 

diff --git a/test/mail/0037.userx b/test/mail/0037.userx
index 6243b66bbc6b07ca102eb35b562bb76d77df977e..8a5e9a1b58684298e40dc860a772c11f1a41dfc9 100644 (file)
--- a/test/mail/0037.userx
+++ b/test/mail/0037.userx
@@ -6,10 +6,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Subject: Test 1
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 
@@ -21,10 +21,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbC-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 Subject: reply to this
+Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Reply to this.
@@ -37,10 +37,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 Subject: should freeze this
+Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 X-added: qualify_domain is test.ex
 
@@ -54,10 +54,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbS-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbS-0005vi-00@the.local.host.name>
 Subject: should freeze this
+Message-Id: <E10HmbS-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 X-added: qualify_domain is test.ex
 
@@ -71,9 +71,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbX-0005vi-00
        for filter-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 

diff --git a/test/mail/0037.userz b/test/mail/0037.userz
index ec84231886cb4aa4e079f4542a226ecfaffdb83d..ae2f0e01af0ba8983247bb02b1a8e3cec09c6b64 100644 (file)
--- a/test/mail/0037.userz
+++ b/test/mail/0037.userz
@@ -6,10 +6,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Subject: Test 1
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 
@@ -20,10 +20,10 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 Subject: should fail this
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Fail this.
@@ -36,10 +36,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 Subject: should freeze this
+Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Freeze this.
@@ -52,10 +52,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbC-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 Subject: reply to this
+Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Reply to this.
@@ -68,10 +68,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbS-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbS-0005vi-00@the.local.host.name>
 Subject: should freeze this
+Message-Id: <E10HmbS-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Freeze this (second message).
@@ -84,9 +84,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbU-0005vi-00
        for readfile@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbU-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Should fail ${readfile in filter.
@@ -99,10 +99,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbY-0005vi-00@the.local.host.name>
 Subject: should defer this
+Message-Id: <E10HmbY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-added: qualify_domain is test.ex
 
 Defer this.

diff --git a/test/mail/0048.CALLER b/test/mail/0048.CALLER
index 9050b95ee99e044f58be3af20a2d2f7ce86dd87c..11101b61dd38367bb8c0151930cdbbdf2f8ea200 100644 (file)
--- a/test/mail/0048.CALLER
+++ b/test/mail/0048.CALLER
@@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 X-Failed-Recipients: pipe@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -57,9 +57,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Some message text.
 
@@ -72,9 +72,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Some message text.
 
@@ -85,13 +85,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbA-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 X-Failed-Recipients: prefixed+pipe@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -137,9 +137,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for prefixed+pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Text
 
@@ -152,9 +152,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for prefixed+pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Text
 
@@ -165,13 +165,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbC-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 X-Failed-Recipients: pipe-suffixed@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -217,9 +217,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
        for pipe-suffixed@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Text
 
@@ -232,9 +232,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
        for pipe-suffixed@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Text
 
@@ -245,13 +245,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbE-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
 X-Failed-Recipients: prefixed+pipe-suffixed@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -297,9 +297,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbD-0005vi-00
        for prefixed+pipe-suffixed@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Text
 
@@ -312,9 +312,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbD-0005vi-00
        for prefixed+pipe-suffixed@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Text
 
@@ -325,13 +325,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbG-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
 X-Failed-Recipients: pipe@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -377,9 +377,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbF-0005vi-00
        for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Some message text.
 
@@ -392,9 +392,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbF-0005vi-00
        for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Some message text.
 

diff --git a/test/mail/0049.userx b/test/mail/0049.userx
index 2028319eadbadb048374c20b885e647a69368541..c6e4b19f9923d017b9892f8578c476b0a0b4c915 100644 (file)
--- a/test/mail/0049.userx
+++ b/test/mail/0049.userx
@@ -6,9 +6,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -20,9 +20,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmaY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -34,9 +34,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmaZ-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -48,9 +48,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -62,9 +62,9 @@ Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbB-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -76,10 +76,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbC-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@myhost.ex>
 From: From person <from@some.where>
+Message-Id: <E10HmbC-0005vi-00@myhost.ex>
 Sender: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -91,10 +91,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbD-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbD-0005vi-00@myhost.ex>
 From: From person <from@some.where>
+Message-Id: <E10HmbD-0005vi-00@myhost.ex>
 Sender: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -106,10 +106,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbE-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbE-0005vi-00@myhost.ex>
 From: From person <from@some.where>
+Message-Id: <E10HmbE-0005vi-00@myhost.ex>
 Sender: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -121,10 +121,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbF-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbF-0005vi-00@myhost.ex>
 From: From person <from@some.where>
+Message-Id: <E10HmbF-0005vi-00@myhost.ex>
 Sender: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -136,10 +136,10 @@ Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbG-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbG-0005vi-00@myhost.ex>
 From: From person <from@some.where>
+Message-Id: <E10HmbG-0005vi-00@myhost.ex>
 Sender: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 

diff --git a/test/mail/0050.userx b/test/mail/0050.userx
index 706b3c3b77000a058a861d119aa1c844d3cbef51..4d209dcd1c45ecda13915d9cf4c33b81fd60f9ca 100644 (file)
--- a/test/mail/0050.userx
+++ b/test/mail/0050.userx
@@ -6,10 +6,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@myhost.ex>
 Sender: Sender in original <sender@original.ex>
+Message-Id: <E10HmaX-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 1.
 
@@ -21,10 +21,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <userx@outside.ex>)
        id 10HmaY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@myhost.ex>
 Sender: Sender in original <sender@original.ex>
+Message-Id: <E10HmaY-0005vi-00@myhost.ex>
 From: userx@outside.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 2.
 
@@ -36,10 +36,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <userx@outside.ex>)
        id 10HmaZ-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@myhost.ex>
 Sender: Sender in original <sender@original.ex>
+Message-Id: <E10HmaZ-0005vi-00@myhost.ex>
 From: userx@outside.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 3.
 
@@ -51,10 +51,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <userx@elsewhere.ex>)
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@myhost.ex>
 Sender: Sender in original <sender@original.ex>
+Message-Id: <E10HmbA-0005vi-00@myhost.ex>
 From: userx@elsewhere.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 4.
 
@@ -66,10 +66,10 @@ Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
        (envelope-from <userx@cus.cam.ac.uk>)
        id 10HmbB-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@myhost.ex>
 Sender: Sender in original <sender@original.ex>
+Message-Id: <E10HmbB-0005vi-00@myhost.ex>
 From: userx@cus.cam.ac.uk
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 5.
 
@@ -81,10 +81,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbC-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@myhost.ex>
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
+Message-Id: <E10HmbC-0005vi-00@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 6.
 
@@ -96,10 +96,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <userx@outside.ex>)
        id 10HmbD-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbD-0005vi-00@myhost.ex>
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
+Message-Id: <E10HmbD-0005vi-00@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 7.
 
@@ -111,9 +111,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbE-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbE-0005vi-00@myhost.ex>
 From: From person <from@some.where>
+Message-Id: <E10HmbE-0005vi-00@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 8.
 
@@ -125,10 +125,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <userx@outside.ex>)
        id 10HmbF-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbF-0005vi-00@myhost.ex>
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
+Message-Id: <E10HmbF-0005vi-00@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 9.
 
@@ -140,10 +140,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <userx@elsewhere.ex>)
        id 10HmbG-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbG-0005vi-00@myhost.ex>
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
+Message-Id: <E10HmbG-0005vi-00@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 10.
 
@@ -155,10 +155,10 @@ Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
        (envelope-from <userx@somehost.test.ex>)
        id 10HmbH-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbH-0005vi-00@myhost.ex>
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
+Message-Id: <E10HmbH-0005vi-00@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 11.
 

diff --git a/test/mail/0051.CALLER b/test/mail/0051.CALLER
index 04882a83de535580f0ff1de2b5b2ffa89d81e90f..322a48d746a0ce4d89f45f18f94122e873b814d8 100644 (file)
--- a/test/mail/0051.CALLER
+++ b/test/mail/0051.CALLER
@@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
        id 10HmaZ-0005vi-00
        for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@myhost.ex>
 X-Failed-Recipients: userx@bad.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
 To: CALLER@myhost.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmaZ-0005vi-00@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -28,9 +28,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmaY-0005vi-00
        for userx@bad.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 2.
 
@@ -41,13 +41,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
        id 10HmbB-0005vi-00
        for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@myhost.ex>
 X-Failed-Recipients: userx@badbad.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
 To: CALLER@myhost.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbB-0005vi-00@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -64,9 +64,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbA-0005vi-00
        for userx@badbad.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 3.
 
@@ -77,13 +77,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
        id 10HmbE-0005vi-00
        for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbE-0005vi-00@myhost.ex>
 X-Failed-Recipients: userx@domain4.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
 To: CALLER@myhost.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbE-0005vi-00@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -100,9 +100,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbD-0005vi-00
        for userx@domain4.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 5.
 
@@ -113,13 +113,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
        id 10HmbG-0005vi-00
        for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbG-0005vi-00@myhost.ex>
 X-Failed-Recipients: userx@domain2.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
 To: CALLER@myhost.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbG-0005vi-00@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -136,9 +136,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbF-0005vi-00
        for userx@domain2.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 6.
 

diff --git a/test/mail/0051.userx b/test/mail/0051.userx
index e03511072800c940d50617578bc52c1eb2f20cd9..7e0caa91c49b8d2086c52b0c3cb65e459e5a3f8c 100644 (file)
--- a/test/mail/0051.userx
+++ b/test/mail/0051.userx
@@ -6,9 +6,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 1.
 
@@ -20,9 +20,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbC-0005vi-00
        for userx@domain1.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 4.
 
@@ -34,9 +34,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbH-0005vi-00
        for userx@xx.domain5.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbH-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 7.
 
@@ -48,9 +48,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbI-0005vi-00
        for userx@domain6.yy.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbI-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 8.
 

diff --git a/test/mail/0052.!one b/test/mail/0052.!one
index b517d8a4057b21de391ccbf1ed308a2ddd3de76d..9e4c91494ca428124d210fb61281e38e8082d4b5 100644 (file)
--- a/test/mail/0052.!one
+++ b/test/mail/0052.!one
@@ -6,9 +6,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbA-0005vi-00
        for !one@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 3.
 

diff --git a/test/mail/0052.CALLER b/test/mail/0052.CALLER
index 6cd2cdefd2c24b748ffe873ef06a78d4bb36b47a..7e0fb955d79c803730391215e5d8c2308c4c5d97 100644 (file)
--- a/test/mail/0052.CALLER
+++ b/test/mail/0052.CALLER
@@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@myhost.ex>
 X-Failed-Recipients: xx99@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
 To: CALLER@myhost.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmaY-0005vi-00@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -28,9 +28,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmaX-0005vi-00
        for xx99@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 1.
 
@@ -41,13 +41,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.ex with local (Exim x.yz)
        id 10HmbC-0005vi-00
        for CALLER@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@myhost.ex>
 X-Failed-Recipients: !two@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.ex>
 To: CALLER@myhost.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbC-0005vi-00@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -64,9 +64,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbB-0005vi-00
        for !two@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 4.
 

diff --git a/test/mail/0052.yy99 b/test/mail/0052.yy99
index b79785c2067f071f442adf591ef8d781fe0c0885..1ebddcbe9e0c5355a630904b24267689a53d2a75 100644 (file)
--- a/test/mail/0052.yy99
+++ b/test/mail/0052.yy99
@@ -6,9 +6,9 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmaZ-0005vi-00
        for yy99@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message 2.
 

diff --git a/test/mail/0055.userx b/test/mail/0055.userx
index 975e3db7e2dc4b295d21b8705df937b7ffd836d7..d31bc4ab298b6029ad18b3999e0dcfc4542a97be 100644 (file)
--- a/test/mail/0055.userx
+++ b/test/mail/0055.userx
@@ -6,8 +6,8 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbA-0005vi-00
        for userx@myhost.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 

diff --git a/test/mail/0072.CALLER b/test/mail/0072.CALLER
index 7ea62885b3f4379d2deb1a36199cb4c292aa15cd..5199f679ab5f2b438c5a4cfb05e1e1916a24925a 100644 (file)
--- a/test/mail/0072.CALLER
+++ b/test/mail/0072.CALLER
@@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
 References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test auto reply to first message; non-printer >\n <
 
@@ -22,13 +22,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbB-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
 References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test auto reply to third message
 
@@ -38,10 +38,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 Subject: third message
+Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This has return_message set.
 
@@ -52,13 +52,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbD-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbC-0005vi-00@the.local.host.name>
 References: <E10HmbC-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test auto reply to third message
 
@@ -73,13 +73,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbF-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbE-0005vi-00@the.local.host.name>
 References: <E10HmbE-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test auto reply to third message
 
@@ -89,10 +89,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbE-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
 Subject: third message
+Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
@@ -102,13 +102,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbH-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
 To: =?ISO-8859-1?Q?CALLER=40test=2Eex?= <CALLER@test.ex>
 In-Reply-To: <E10HmbG-0005vi-00@the.local.host.name>
 References: <E10HmbG-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test auto reply to Encoded from
 

diff --git a/test/mail/0073.CALLER b/test/mail/0073.CALLER
index 5b42d0548308039602b0ee7b649acbb7ccdf8de4..45eac6bfe6c7201de5760872c701c63ea5d63873 100644 (file)
--- a/test/mail/0073.CALLER
+++ b/test/mail/0073.CALLER
@@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
 References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test auto reply to first message
 
@@ -22,13 +22,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbB-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
 References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test auto reply to third message
 

diff --git a/test/mail/0074.CALLER b/test/mail/0074.CALLER
index 28c9f6a9e60c8801209a44287581dd754bcc07eb..667c731394b86abb7e8bf9c3c9a572ac44630765 100644 (file)
--- a/test/mail/0074.CALLER
+++ b/test/mail/0074.CALLER
@@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
 References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Auto reply to first message
 
@@ -22,13 +22,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmbB-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
 References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Auto reply to third message
 

diff --git a/test/mail/0074.userx b/test/mail/0074.userx
index 637092558df8a96c43ff8f4d8720f68344f12db6..fb5be8ac13ed6426f1b0dd04e5d23b4696366ed8 100644 (file)
--- a/test/mail/0074.userx
+++ b/test/mail/0074.userx
@@ -6,10 +6,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Subject: first message
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
@@ -20,10 +20,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 Subject: second message
+Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
@@ -34,10 +34,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 Subject: third message
+Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
@@ -48,11 +48,11 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbC-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 Subject: fourth message
 X-nltest: xxxx
+Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
@@ -61,13 +61,13 @@ Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmbD-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 To: userx@test.ex,  abey seedy <abcd@test.ex>
 In-Reply-To: <E10HmbC-0005vi-00@the.local.host.name>
 References: <E10HmbC-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Testing, testing
 
@@ -79,12 +79,12 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbE-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
 Subject: fifth message
 Reply-to: userx@test.ex,
   abcd@test.ex
+Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
@@ -93,13 +93,13 @@ Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 To: userx@test.ex,   abcd@test.ex
 In-Reply-To: <E10HmbE-0005vi-00@the.local.host.name>
 References: <E10HmbE-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 To reply-to
 

diff --git a/test/mail/0075.subdir/userx b/test/mail/0075.subdir/userx
index b30566ab455c2137277ec17bf24f853e16396e4d..40bcd43f78417cb0f75330be5ef67f7e382388dc 100644 (file)
--- a/test/mail/0075.subdir/userx
+++ b/test/mail/0075.subdir/userx
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Subject: first message
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 

diff --git a/test/mail/0079.userx b/test/mail/0079.userx
index a76777584196d8b54197ffa2f43af6491d5a433d..7a5b5233cfbae1e387e77ccafea741b932bbec9a 100644 (file)
--- a/test/mail/0079.userx
+++ b/test/mail/0079.userx
@@ -33,10 +33,10 @@ Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        (envelope-from <postmaster@exim.test.ex>)
        id 10HmaZ-0005vi-00
        for userx@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 sysmail: yes
+Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: postmaster@exim.test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Testing mail from system filter
 
@@ -47,13 +47,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmbA-0005vi-00
        for userx@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 To: userx@exim.test.ex
 In-Reply-To: <E10HmaZ-0005vi-00@the.local.host.name>
 References: <E10HmaZ-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER@exim.test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 testing testing
 

diff --git a/test/mail/0081.userx b/test/mail/0081.userx
index 417bb1ec388549f19a043ff0c46aac712e6df1b9..4f0d895b0a88d97bb5686c95c93a88baa7ce0153 100644 (file)
--- a/test/mail/0081.userx
+++ b/test/mail/0081.userx
@@ -6,8 +6,6 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@exim.test.ex>)
        id 10HmaX-0005vi-00
        for userx@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 X-one: This is the first text.
 To: userx@exim.test.ex
 X-one: This is the second text.
@@ -15,6 +13,8 @@ From: userx@exim.test.ex
 X-one: This is the third text.
 Subject: testing, testing
 X-one: This is the fourth text.
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is the message body.
 

diff --git a/test/mail/0082.userx b/test/mail/0082.userx
index 4f81ce483d143515c72f37776ae06cd1b3eda10d..17116627931b9049fed02fc0863cab21e417da6a 100644 (file)
--- a/test/mail/0082.userx
+++ b/test/mail/0082.userx
@@ -6,10 +6,10 @@ Received: from CALLER by the.local.host.name with testproto (Exim x.yz)
        (envelope-from <userx@cus.cam.ac.uk>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 from: me@the.local.host.name
 To: me@the.local.host.name
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Proto: testproto
 
 This is some text

diff --git a/test/mail/0083.userx b/test/mail/0083.userx
index 3af56820c976acddb35be8b6b564b29985e5b2f1..994175b684267f852b09cfd0e00ed4d82ca4a54f 100644 (file)
--- a/test/mail/0083.userx
+++ b/test/mail/0083.userx
@@ -6,10 +6,10 @@ Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
        (envelope-from <userx@cus.cam.ac.uk>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 from: me@the.local.host.name
 To: me@the.local.host.name
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Proto: local-bsmtp
 
 This is some text

diff --git a/test/mail/0090.CALLER b/test/mail/0090.CALLER
index c778822b7be8036fc0bc911d44a6a1ebab74f1f1..14156674a41d11df4e1b7c2f91d40fedf187aca6 100644 (file)
--- a/test/mail/0090.CALLER
+++ b/test/mail/0090.CALLER
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 To: CALLER@myhost.test.ex
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
 References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: EXIMUSER@myhost.test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is an autogenerated message.
 

diff --git a/test/mail/0095.userx b/test/mail/0095.userx
index 238daeb36e8937e3d55653cd0df8c339a12f41b9..bd5e61c81f21d3237abd2f732374a5925d54fa78 100644 (file)
--- a/test/mail/0095.userx
+++ b/test/mail/0095.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message
 
@@ -14,11 +14,11 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 quota: 0
 threshold: 10
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message
 
@@ -27,11 +27,11 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 quota: 10K
 threshold: 900
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A test message
 
@@ -39,13 +39,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from root by myhost.test.ex with local (Exim x.yz)
        id 10HmbA-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 From : p@q
 Reply-To: a@b
 To: userx@myhost.test.ex
 Subject: Your mailbox
+Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Your mailbox has crossed the threshold
 
@@ -54,11 +54,11 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbB-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 quota: 2200
 threshold: 90%
+Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message
 
@@ -66,13 +66,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from root by myhost.test.ex with local (Exim x.yz)
        id 10HmbC-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 Reply-To: x@y
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: userx@myhost.test.ex
 Subject: Your mailbox
+Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message is automatically created by mail delivery software (Exim).
 
@@ -84,9 +84,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbD-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -194,9 +194,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbE-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

diff --git a/test/mail/0095.userz b/test/mail/0095.userz
index 2720b972def8c8ae04195648f06229ca7780c32d..f10b3ea30d5c5c42f8b2a71a59e0af10e585cd6a 100644 (file)
--- a/test/mail/0095.userz
+++ b/test/mail/0095.userz
@@ -3,10 +3,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbG-0005vi-00
        for userz@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
 threshold: 330
+Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 
 

diff --git a/test/mail/0095.userz.bounce b/test/mail/0095.userz.bounce
index bf73931fe048dafac43e79a24d0ea0ba11a7ebee..840e40fd59eb37cd197ff03149ddc373b575d638 100644 (file)
--- a/test/mail/0095.userz.bounce
+++ b/test/mail/0095.userz.bounce
@@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from root by myhost.test.ex with local (Exim x.yz)
        id 10HmbH-0005vi-00
        for userz@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbH-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: userz@myhost.test.ex
 Subject: Your mailbox
+Message-Id: <E10HmbH-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 
 This message is automatically created by mail delivery software (Exim).

diff --git a/test/mail/0096.userx b/test/mail/0096.userx
index 2cb54cc5b9dfbb403a0d97678e3c4f9d315a453f..1dadfc4cef05d8be733619a2b7bf7ee0156d8917 100644 (file)
--- a/test/mail/0096.userx
+++ b/test/mail/0096.userx
@@ -6,10 +6,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Subject: First message subject
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
@@ -20,10 +20,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 X-RBL-Warning: A faked up RBL header
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Added: xxxx
 
 

diff --git a/test/mail/0097.userx b/test/mail/0097.userx
index 299a89e322ce528a3cdc701525c0f95d1afac804..1c062a26478adf4c6f6a05ecedfdadd11fc39a10 100644 (file)
--- a/test/mail/0097.userx
+++ b/test/mail/0097.userx
@@ -6,10 +6,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Subject: First message subject
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
@@ -20,10 +20,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 X-RBL-Warning: A faked up RBL header
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Added: by router
 Added: by transport
 

diff --git a/test/mail/0098.CALLER b/test/mail/0098.CALLER
index ecf48dad0e12fb0eb43bcaa274b3917ab4f454f8..532931db04f06349b6bec05b4b383fda7592a622 100644 (file)
--- a/test/mail/0098.CALLER
+++ b/test/mail/0098.CALLER
@@ -5,12 +5,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Warning: message 10HmaX-0005vi-00 delayed 0 minutes
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 A message that you sent has not yet been delivered to one or more of its
@@ -38,12 +38,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbA-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Warning: message 10HmaZ-0005vi-00 delayed 0 minutes
+Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 A message that you sent has not yet been delivered to one or more of its
@@ -71,12 +71,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbC-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Warning: message 10HmaX-0005vi-00 delayed 0 minutes
+Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 A message that you sent has not yet been delivered to one or more of its
@@ -104,12 +104,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbE-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Warning: message 10HmaX-0005vi-00 delayed by 10 minutes
+Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 warn_message_delay      = 10 minutes
 warn_message_recipients = CALLER@test.ex
@@ -132,12 +132,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbF-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Warning: message 10HmaZ-0005vi-00 delayed by 0 minutes
+Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 warn_message_delay      = 0 minutes
 warn_message_recipients = CALLER@test.ex
@@ -160,12 +160,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbG-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Warning: message 10HmbB-0005vi-00 delayed by 0 minutes
+Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 warn_message_delay      = 0 minutes
 warn_message_recipients = CALLER@test.ex
@@ -185,12 +185,12 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbH-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Warning: message 10HmbD-0005vi-00 delayed by 0 minutes
+Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 warn_message_delay      = 0 minutes
 warn_message_recipients = CALLER@test.ex

diff --git a/test/mail/0100.CALLER b/test/mail/0100.CALLER
index fbfaf7da0f178e28421b422605d31a4bf885d508..49db745bf87014a113990ea7fef2f7f32e4674d4 100644 (file)
--- a/test/mail/0100.CALLER
+++ b/test/mail/0100.CALLER
@@ -6,9 +6,9 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbK-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbK-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message containing
 . a line starting with a dot

diff --git a/test/mail/0100.userw b/test/mail/0100.userw
index 15bffa91fe85c880674e7b487617dc4ccc66ae88..3906e41a9013cc77fa9f3ba8cffa194412bd10ed 100644 (file)
--- a/test/mail/0100.userw
+++ b/test/mail/0100.userw
@@ -9,9 +9,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbC-0005vi-00
        for userw@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message containing
 .. a line starting with a dot

diff --git a/test/mail/0100.userx b/test/mail/0100.userx
index c00830065fbcce8776bcbc4cf7edff3c6076ffb7..1de79e03f4d8f8fb5a2c2f4a9d7aea7a6384b90a 100644 (file)
--- a/test/mail/0100.userx
+++ b/test/mail/0100.userx
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 >From the deep abyss
@@ -26,9 +26,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -168,9 +168,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -310,9 +310,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbE-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -452,9 +452,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbF-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Last line ending without a newline and with a partial match: 
 From
@@ -468,9 +468,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbG-0005vi-00
        for filter-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 >From the deep abyss
@@ -489,9 +489,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbH-0005vi-00
        for filter-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Last line ending without a newline and with a partial match: 
 From
@@ -504,9 +504,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbI-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbI-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Last line ending without a newline and being a single dot:
 .
@@ -516,9 +516,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbJ-0005vi-00
        for mmdf-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbJ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Line consisting of four ^A characters
 \ 1\ 1\ 1\ 1 
@@ -532,10 +532,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbL-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbL-0005vi-00@the.local.host.name>
 Subject: From
+Message-Id: <E10HmbL-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 >From is the very first word of the message.
 >From starts the second line.

diff --git a/test/mail/0100.usery b/test/mail/0100.usery
index f79004b7a8f1204572ce295ae10a2c7cb633b23f..a7f4709782e0d7f9ae4feced3e397eedbd342f7e 100644 (file)
--- a/test/mail/0100.usery
+++ b/test/mail/0100.usery
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 From the deep abyss

diff --git a/test/mail/0100.userz b/test/mail/0100.userz
index 8d7d5afa5c3979e8f070d4c3a02320c933cc9713..41f2f9883b1acd27f4e272229773c3861bfa8114 100644 (file)
--- a/test/mail/0100.userz
+++ b/test/mail/0100.userz
@@ -8,9 +8,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
        for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message containing
 .. a line starting with a dot

diff --git a/test/mail/0101.userx b/test/mail/0101.userx
index a9bf95600d7583f047b5210c6baff0ff8dfaaa1c..4848398b4534fb9ac3b351b763e429b2914f331d 100644 (file)
--- a/test/mail/0101.userx
+++ b/test/mail/0101.userx
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 >From the deep abyss
@@ -20,9 +20,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -159,9 +159,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -298,9 +298,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbC-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -437,9 +437,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbD-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Last line ending without a newline and with a partial match: 
 From
@@ -453,9 +453,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbE-0005vi-00
        for filter-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 From the deep abyss
@@ -474,9 +474,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbF-0005vi-00
        for filter-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Last line ending without a newline and with a partial match: 
 From
@@ -486,9 +486,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbG-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Last line ending without a newline and being a single dot:
 .
@@ -498,9 +498,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbH-0005vi-00
        for mmdf-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Line consisting of four ^A characters
 \ 1\ 1\ 1\ 1 
@@ -511,10 +511,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbI-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbI-0005vi-00@the.local.host.name>
 Subject: From
+Message-Id: <E10HmbI-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 >From is the very first word of the message.
 >From starts the second line.

diff --git a/test/mail/0101.userz b/test/mail/0101.userz
index 81763e04ab87c318951dc045bd9e48d9db52726d..a340c343f66612b012c2451023dc5df56ba6ee23 100644 (file)
--- a/test/mail/0101.userz
+++ b/test/mail/0101.userz
@@ -8,9 +8,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message containing
 .. a line starting with a dot

diff --git a/test/mail/0102.batched b/test/mail/0102.batched
index acfab6b94d008f40b242a15e7030fb8300b0cbc7..2160dc31c790bb61dac6e346a057b4519229049b 100644 (file)
--- a/test/mail/0102.batched
+++ b/test/mail/0102.batched
@@ -5,9 +5,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbG-0005vi-00
        for batch-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test to batch-userx
 .
@@ -18,9 +18,9 @@ DATA
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbH-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test to batch-userx and batch-usery
 .

diff --git a/test/mail/0102.userx b/test/mail/0102.userx
index 2131c64978d7be326adcd9bd3d81750fe80b6ae1..2b5ed9885d9df5c835bbd6aae96a09799fed06f9 100644 (file)
--- a/test/mail/0102.userx
+++ b/test/mail/0102.userx
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Initial test message, no prefix.
 
@@ -20,9 +20,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Second test message, no prefix.
 

diff --git a/test/mail/0102.usery b/test/mail/0102.usery
index 0e4d34cf139bcedf93035aa72bbb7a1d69dcc56e..b3cca92ca9bf1d806a492c741fe7720bf67a8e44 100644 (file)
--- a/test/mail/0102.usery
+++ b/test/mail/0102.usery
@@ -8,9 +8,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for bsmtp_usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message with bsmtp_ prefix
 .
@@ -24,9 +24,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Second test message, no prefix.
 .

diff --git a/test/mail/0102.userz b/test/mail/0102.userz
index c32c363cf97da778757f8573e656957d1ed2f89f..2a8c4ad7f8a8a336bd6bb74cd0b6c508cd8380dd 100644 (file)
--- a/test/mail/0102.userz
+++ b/test/mail/0102.userz
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
        for mmdf_userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message with mmdf_ prefix
 \ 1\ 1\ 1\ 1
@@ -14,9 +14,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbC-0005vi-00
        for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Second test message, no prefix.
 \ 1\ 1\ 1\ 1
@@ -25,9 +25,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbD-0005vi-00
        for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Second test message, no prefix.
 \ 1\ 1\ 1\ 1

diff --git a/test/mail/0103.CALLER b/test/mail/0103.CALLER
index ba79910f9c25151e2e86d6a974eeba93efea330a..f8ac3c475e68eacbbcaf3ae2ae56e8b6455a0587 100644 (file)
--- a/test/mail/0103.CALLER
+++ b/test/mail/0103.CALLER
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaZ-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 X-Failed-Recipients: WASabc@x.y.zWAS
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -26,9 +26,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for "abc@x.y.z"@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message sent to "abc@x.y.z"@test.ex.
 
@@ -36,13 +36,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbD-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 X-Failed-Recipients: ":fail: fail message"@special
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -59,9 +59,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbC-0005vi-00
        for ":fail: fail message"@special; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message sent to ":fail: fail message"@special
 

diff --git a/test/mail/0103.rewritten b/test/mail/0103.rewritten
index 17b6118eb8a057caf99ce707ad6da7048c0cc91e..c01a105ab9a1facff8cf185dcca51540fd42db4d 100644 (file)
--- a/test/mail/0103.rewritten
+++ b/test/mail/0103.rewritten
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for "xyz@x.y.z"@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message sent to "xyz@x.y.z"@test.ex.
 

diff --git a/test/mail/0104.mmm b/test/mail/0104.mmm
index 44da908388b2e910689468b8b005f2bc4692b791..bc92557765f1bb0811becb801a8ebb1fef2e4ff2 100644 (file)
--- a/test/mail/0104.mmm
+++ b/test/mail/0104.mmm
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for mmm@ten-1; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 To: You <mmm@ten-1.test.ex>
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 

diff --git a/test/mail/0104.yyy b/test/mail/0104.yyy
index 3aa7b0dd68386e04f34d2e3cd1029626f80e92c4..4096709e3f8a9241d8c4321d1327bd02cafe5fdd 100644 (file)
--- a/test/mail/0104.yyy
+++ b/test/mail/0104.yyy
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for yyy@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 To: comment <yyy@test.ex>
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 

diff --git a/test/mail/0105.default b/test/mail/0105.default
index 3784482121e067f67976fd65463da257e59e1888..d6218632dd996475e6bf80e42f32c8ed071bbb9e 100644 (file)
--- a/test/mail/0105.default
+++ b/test/mail/0105.default
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Delivered to default
 

diff --git a/test/mail/0105.firstuser b/test/mail/0105.firstuser
index 73c535b1eced55d6359506d21d29730a82319b6f..98088c7d9fe4d3d7c06f51ba751e65aa8c91077d 100644 (file)
--- a/test/mail/0105.firstuser
+++ b/test/mail/0105.firstuser
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for firstuser@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Delivered to firstuser
 

diff --git a/test/mail/0105.seconduser b/test/mail/0105.seconduser
index 36a2d316fe59814ab71a4869defd0cd9022ca009..90f98df376ab4bdc39cdeb96aebf6d7669b646dc 100644 (file)
--- a/test/mail/0105.seconduser
+++ b/test/mail/0105.seconduser
@@ -6,9 +6,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for seconduser@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Delivered to seconduser
 

diff --git a/test/mail/0110.second b/test/mail/0110.second
index b9b03a45fb598e68b800f490752abe0b8d73ef4f..3f228bef7ef614804c978644fe08e46839a17784 100644 (file)
--- a/test/mail/0110.second
+++ b/test/mail/0110.second
@@ -3,8 +3,8 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for first@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 

diff --git a/test/mail/0111.userx b/test/mail/0111.userx
index 52e40075821fd5b1038561c75007e9abc694ff92..9f535da711c03fc31ca6816fe635a994dc5f0c1a 100644 (file)
--- a/test/mail/0111.userx
+++ b/test/mail/0111.userx
@@ -4,9 +4,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-Forward: userx
 X-Alias: philip
 
@@ -17,9 +17,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for Philip@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-Alias: philip
 X-Forward: userx
 
@@ -30,9 +30,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for philip@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-Alias: philip
 X-Forward: userx
 

diff --git a/test/mail/0112.file b/test/mail/0112.file
index 73574e98d041416aabd92788fe227c2a5598ad61..7bc02a7a6dcce7e28b7fb2c546c59e34696204ff 100644 (file)
--- a/test/mail/0112.file
+++ b/test/mail/0112.file
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for file@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message to file.
 

diff --git a/test/mail/0112.pipe b/test/mail/0112.pipe
index 70591d67c3258c09d6f3d6f8ec1e4c798a8e1fdd..3f86bc8ae930bd4de6d0c402693eada9d155b842 100644 (file)
--- a/test/mail/0112.pipe
+++ b/test/mail/0112.pipe
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message to pipe.
 

diff --git a/test/mail/0113.second b/test/mail/0113.second
index b9b03a45fb598e68b800f490752abe0b8d73ef4f..3f228bef7ef614804c978644fe08e46839a17784 100644 (file)
--- a/test/mail/0113.second
+++ b/test/mail/0113.second
@@ -3,8 +3,8 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for first@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 

diff --git a/test/mail/0114.file b/test/mail/0114.file
index ebd205b1be5e381045e767c2543d010e01985488..a04c45d00b260c2d353ad7e112128577a4f82b78 100644 (file)
--- a/test/mail/0114.file
+++ b/test/mail/0114.file
@@ -3,23 +3,23 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for file@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message to file.
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 To: A. File <file@test.ex>, No One <null@test.ex>
 Subject: autoreply
 In-Reply-To: <E10HmaZ-0005vi-00@the.local.host.name>
 References: <E10HmaZ-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test Text
 

diff --git a/test/mail/0114.pipe b/test/mail/0114.pipe
index 70591d67c3258c09d6f3d6f8ec1e4c798a8e1fdd..3f86bc8ae930bd4de6d0c402693eada9d155b842 100644 (file)
--- a/test/mail/0114.pipe
+++ b/test/mail/0114.pipe
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message to pipe.
 

diff --git a/test/mail/0115.file b/test/mail/0115.file
index 021c3cd7a966cc6b8e70f91a4b94938ff3fe5bae..cce7503881a965348706167b5e35da9d6f983ab0 100644 (file)
--- a/test/mail/0115.file
+++ b/test/mail/0115.file
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Home-Dir: 
 
 Message to userx.
@@ -15,9 +15,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for one-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Home-Dir: TESTSUITE/aux-fixed
 
 Message to one-userx.
@@ -27,9 +27,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for two-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Home-Dir: /tmp
 
 Message to two-userx.
@@ -39,9 +39,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for three-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Home-Dir: 
 
 Message to three-userx.

diff --git a/test/mail/0116.acopy b/test/mail/0116.acopy
index a07b9fee55e4126be61c50837db439714c00bd82..e9c3e763eeb8bbbb24e4748c6852e1eded20e28e 100644 (file)
--- a/test/mail/0116.acopy
+++ b/test/mail/0116.acopy
@@ -2,9 +2,9 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Added: data from copyalias
 
 Message sent to acopy.

diff --git a/test/mail/0116.alias1 b/test/mail/0116.alias1
index a07b9fee55e4126be61c50837db439714c00bd82..e9c3e763eeb8bbbb24e4748c6852e1eded20e28e 100644 (file)
--- a/test/mail/0116.alias1
+++ b/test/mail/0116.alias1
@@ -2,9 +2,9 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Added: data from copyalias
 
 Message sent to acopy.

diff --git a/test/mail/0116.alias2 b/test/mail/0116.alias2
index a07b9fee55e4126be61c50837db439714c00bd82..e9c3e763eeb8bbbb24e4748c6852e1eded20e28e 100644 (file)
--- a/test/mail/0116.alias2
+++ b/test/mail/0116.alias2
@@ -2,9 +2,9 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Added: data from copyalias
 
 Message sent to acopy.

diff --git a/test/mail/0116.dcopy b/test/mail/0116.dcopy
index 4899c4d2233ce35be981ea9a03139a91879cbae1..d53ee0bea44d4806a1c0ae03e3719e77e3395b83 100644 (file)
--- a/test/mail/0116.dcopy
+++ b/test/mail/0116.dcopy
@@ -2,9 +2,9 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Added: data from copydeliver
 
 Message sent to dcopy.
@@ -13,9 +13,9 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Added: data from copydeliver
 
 Message sent to dcopy.

diff --git a/test/mail/0118.userx b/test/mail/0118.userx
index 697244059363d2cc909697a3bfda8749f22613cf..e3b8635434aa1f6b0ce02d355d1fca703d8dc093 100644 (file)
--- a/test/mail/0118.userx
+++ b/test/mail/0118.userx
@@ -3,8 +3,8 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 

diff --git a/test/mail/0127.userx b/test/mail/0127.userx
index 28b1f31507109994256a46b4d0ce6be57739ad1e..364abefaddf9eb5996cb964d2ae48c55a5b2c854 100644 (file)
--- a/test/mail/0127.userx
+++ b/test/mail/0127.userx
@@ -6,10 +6,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@myhost.ex>
 Sender: Sender in original <sender@original.ex>
+Message-Id: <E10HmaX-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -21,10 +21,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmaY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@myhost.ex>
 Sender: Sender in original <sender@original.ex>
+Message-Id: <E10HmaY-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -36,10 +36,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmaZ-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@myhost.ex>
 Sender: Sender in original <sender@original.ex>
+Message-Id: <E10HmaZ-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -51,10 +51,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@myhost.ex>
 Sender: Sender in original <sender@original.ex>
+Message-Id: <E10HmbA-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -66,10 +66,10 @@ Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbB-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@myhost.ex>
 Sender: Sender in original <sender@original.ex>
+Message-Id: <E10HmbB-0005vi-00@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -81,10 +81,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbC-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@myhost.ex>
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
+Message-Id: <E10HmbC-0005vi-00@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -96,10 +96,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbD-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbD-0005vi-00@myhost.ex>
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
+Message-Id: <E10HmbD-0005vi-00@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -111,10 +111,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbE-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbE-0005vi-00@myhost.ex>
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
+Message-Id: <E10HmbE-0005vi-00@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -126,10 +126,10 @@ Received: from CALLER by myhost.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbF-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbF-0005vi-00@myhost.ex>
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
+Message-Id: <E10HmbF-0005vi-00@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -141,10 +141,10 @@ Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbG-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbG-0005vi-00@myhost.ex>
 Sender: Sender in original <sender@original.ex>
 From: From person <from@some.where>
+Message-Id: <E10HmbG-0005vi-00@myhost.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 

diff --git a/test/mail/0131.copy b/test/mail/0131.copy
index 66daee4b06ece4365125f5a0f35846a28f6fa980..798a7af6e269643ddc80ebaeec0b24be4b173078 100644 (file)
--- a/test/mail/0131.copy
+++ b/test/mail/0131.copy
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@not.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Address-Data: >-islocal-forward-forward-local<
 
 Test message

diff --git a/test/mail/0131.userx b/test/mail/0131.userx
index 94f4a9ba9fa162e9c022c9e4f61df74dc9560b97..85a3958ceb740426956e8dc545c81b6a5731c726 100644 (file)
--- a/test/mail/0131.userx
+++ b/test/mail/0131.userx
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@not.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Address-Data: >-islocal-forward-islocal-local<
 
 Test message

diff --git a/test/mail/0133.dddd b/test/mail/0133.dddd
index e71139135bd374ded5a5e0035fec5657d78014f1..98c203b70308b133f7bbe0f821174fc1e1cebbb4 100644 (file)
--- a/test/mail/0133.dddd
+++ b/test/mail/0133.dddd
@@ -3,9 +3,9 @@ Envelope-to: userx@a.test.ex
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Final: dddd@a.test.ex
 
 Test message
@@ -15,9 +15,9 @@ Envelope-to: usery@b.test.ex
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Final: dddd@test.ex
 
 Test message

diff --git a/test/mail/0134.UC-USERX b/test/mail/0134.UC-USERX
index 4273d8261955160fb03c9183666e9be25730d898..78e8ca8eee1a4476ec9005b138cbc9f2565c1360 100644 (file)
--- a/test/mail/0134.UC-USERX
+++ b/test/mail/0134.UC-USERX
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbD-0005vi-00
        for USERX@KNOWN.DOMAIN; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 domainlist: dd=data for known.domain lpd=data for userx
 domain_data: data for known.domain
 local_part_data: data for userx

diff --git a/test/mail/0134.lc-unknown b/test/mail/0134.lc-unknown
index 21d2c808f52040aca0aa4a115ccf61e84182b313..4495f885dc8aa417c56c7e49aa4df71ea14f03ed 100644 (file)
--- a/test/mail/0134.lc-unknown
+++ b/test/mail/0134.lc-unknown
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for unknown@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 router: defaulted
 domain_data: 
 local_part_data: 
@@ -16,9 +16,9 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 router: defaulted
 domain_data: 
 local_part_data: 
@@ -30,9 +30,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbC-0005vi-00
        for UNKNOWN@KNOWN.DOMAIN; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 domain_data: 
 local_part_data: 
 

diff --git a/test/mail/0134.lc-userx b/test/mail/0134.lc-userx
index c1c6fa19b525dbac409110d40d2d0f36e6986ebf..0d8a3c837f3586a02020e0f0f00d5860eaee3470 100644 (file)
--- a/test/mail/0134.lc-userx
+++ b/test/mail/0134.lc-userx
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for userx@unknown.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 router: defaulted
 domain_data: 
 local_part_data: 
@@ -16,9 +16,9 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 smartuser: dd=data for test.ex lpd=data for userx
 domain_data: data for test.ex
 local_part_data: data for userx
@@ -30,9 +30,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for userx@unknown.domain; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 domain_data: 
 local_part_data: 
 
@@ -43,9 +43,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
        for userx@known.domain; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 domainlist: dd=data for known.domain lpd=data for userx
 domain_data: data for known.domain
 local_part_data: data for userx

diff --git a/test/mail/0136.forwarder b/test/mail/0136.forwarder
index 6df0a082ec4a0731792dd3ea7b8f1807091d97b2..9d74ba75ee657b7f7e42baa4e2abeb8ea4c1ec69 100644 (file)
--- a/test/mail/0136.forwarder
+++ b/test/mail/0136.forwarder
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaZ-0005vi-00
        for forwarder@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: forwarder@test.ex
 Subject: Mail delivery failed
+Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -29,9 +29,9 @@ Return-path: <abcd@x.y.z>
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        (envelope-from <abcd@x.y.z>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: abcd@x.y.z
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message.
 
@@ -39,13 +39,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbC-0005vi-00
        for forwarder@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: forwarder@test.ex
 Subject: Mail delivery failed
+Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -66,8 +66,8 @@ Return-path: <abcd@x.y.z>
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        (envelope-from <abcd@x.y.z>)
        id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: abcd@x.y.z
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 

diff --git a/test/mail/0137.userx b/test/mail/0137.userx
index 7b7147c95c18a22f387be35826a6e2e325e141f3..7dd068d1071e9275b01d3addae5cf13122dea06a 100644 (file)
--- a/test/mail/0137.userx
+++ b/test/mail/0137.userx
@@ -3,10 +3,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Transport: local_delivery
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 First message.
 
@@ -15,10 +15,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 Transport: local_delivery
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Second message
 
@@ -27,10 +27,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 Transport: local_delivery_fcntl
+Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Third message
 
@@ -39,10 +39,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 Transport: local_delivery_fcntl_blocking
+Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Fourth message
 

diff --git a/test/mail/0140.CALLER b/test/mail/0140.CALLER
index 468c76fc5dfb3eb5cb30b62304385ab91401f766..e7882aa43a2f100417c0633cca6d826e13d81055 100644 (file)
--- a/test/mail/0140.CALLER
+++ b/test/mail/0140.CALLER
@@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 To: Reply Person <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
 References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test auto reply to first message; non-printer >\b<
 this is another line
@@ -23,13 +23,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbA-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 X-Failed-Recipients: reply2@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -45,9 +45,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for reply2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 Subject: first message; non-printer >\b<
+Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 

diff --git a/test/mail/0142.CALLER b/test/mail/0142.CALLER
index 7a937b1dc7a17ebde0e6b8ab6d11c646e5bdfc2a..a7d97c7a774564b9968b52dbb46a38d0338911c3 100644 (file)
--- a/test/mail/0142.CALLER
+++ b/test/mail/0142.CALLER
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 X-Failed-Recipients: pipe@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -32,9 +32,9 @@ Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 

diff --git a/test/mail/0142.filter b/test/mail/0142.filter
index 3ecd4b929536402607695a9925575f67d8a8b9b1..7dca98165773b9378a4f1becf979111287e006b0 100644 (file)
--- a/test/mail/0142.filter
+++ b/test/mail/0142.filter
@@ -2,9 +2,9 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 max fd = dddd

diff --git a/test/mail/0150.postmaster b/test/mail/0150.postmaster
index a0f66f5374e7f8d78cbdc692c47dcc41561c55c1..eb51b1c2f3f26e49f536ac05a244f2f1af3d37ba 100644 (file)
--- a/test/mail/0150.postmaster
+++ b/test/mail/0150.postmaster
@@ -3,10 +3,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: not.the.login@test.ex
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 

diff --git a/test/mail/0151.postmaster b/test/mail/0151.postmaster
index d3454fa19fb6b631db40ba2f645f617a839385d0..58f860c6d50058c45d5a622eddaceee5fd17fbc7 100644 (file)
--- a/test/mail/0151.postmaster
+++ b/test/mail/0151.postmaster
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: not.the.login@test.ex
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 

diff --git a/test/mail/0152.postmaster b/test/mail/0152.postmaster
index 5facda3d29e64ab5caf38199d943d26c71bcfb3b..2e23156212d6e4bd0bad7a8e28a44fbb1111e8c0 100644 (file)
--- a/test/mail/0152.postmaster
+++ b/test/mail/0152.postmaster
@@ -3,10 +3,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: not.the.login@test.ex
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
@@ -15,9 +15,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: page+CALLER@test.ex
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
@@ -26,10 +26,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: call+CALLER@test.ex
+Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
@@ -38,9 +38,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: call-CALLER@test.ex
+Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
@@ -49,9 +49,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: CALLER&page@test.ex
+Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
@@ -60,10 +60,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbC-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 From: CALLER&call@test.ex
+Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
@@ -72,9 +72,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbD-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: CALLER=call@test.ex
+Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
@@ -83,9 +83,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbE-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
 From: page+CALLER=call@test.ex
+Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 

diff --git a/test/mail/0164.CALLER b/test/mail/0164.CALLER
index ce3f8be0957c1eabfce14c13cb7f04de265da6dd..208c762729155c3080f07b6df2726aabeee2fa07 100644 (file)
--- a/test/mail/0164.CALLER
+++ b/test/mail/0164.CALLER
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -55,9 +55,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 ------------------
@@ -69,22 +69,22 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbA-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -130,9 +130,9 @@ USER=system-filter
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 ------------------
@@ -143,8 +143,8 @@ Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 

diff --git a/test/mail/0165.CALLER b/test/mail/0165.CALLER
index 1f8c3fac7eef1c20df99907556fc5ed8c4560653..4ede20de79480e0fcad5331feff7aa5359cb46c0 100644 (file)
--- a/test/mail/0165.CALLER
+++ b/test/mail/0165.CALLER
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -55,9 +55,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 ------------------
@@ -69,22 +69,22 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbA-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -132,9 +132,9 @@ USER=system-filter
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 ------------------
@@ -145,8 +145,8 @@ Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 

diff --git a/test/mail/0166.userx b/test/mail/0166.userx
index 44c5b43b795246a32c60f37049176c4462bde918..3c58c0da1c29708387c91e91504fef8a5555994a 100644 (file)
--- a/test/mail/0166.userx
+++ b/test/mail/0166.userx
@@ -4,9 +4,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-Delivered-To: a@test.ex
 X-Delivered-To: b@test.ex
 X-Delivered-To: c@test.ex

diff --git a/test/mail/0166.usery b/test/mail/0166.usery
index b902efb373c64e8b883bbd2e43dd55c91960ffe6..529767368831f77932f19940ac5cd89df47a14a2 100644 (file)
--- a/test/mail/0166.usery
+++ b/test/mail/0166.usery
@@ -4,9 +4,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-Delivered-To: a@test.ex
 X-Delivered-To: bb@test.ex
 X-Delivered-To: e@test.ex

diff --git a/test/mail/0167.userx b/test/mail/0167.userx
index f1d32cb835050659f989841794318edee33a9cf3..c5ac0af4a957a0e0afa7df9412c47697492e99d4 100644 (file)
--- a/test/mail/0167.userx
+++ b/test/mail/0167.userx
@@ -5,9 +5,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
@@ -16,9 +16,9 @@ Envelope-to: userx@test.ex
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: remove@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
@@ -28,8 +28,8 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <trakill@test.ex>)
        id 10HmaZ-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: trakill@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 

diff --git a/test/mail/0169.userx b/test/mail/0169.userx
index 6642d482e30489ef544cfadaabb1636f228d4e9a..34ff7fcd07c3346c45870e6d5bb73db0c5bdc061 100644 (file)
--- a/test/mail/0169.userx
+++ b/test/mail/0169.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message
 
@@ -14,11 +14,11 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 quota: 0
 threshold: 10
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message
 
@@ -27,11 +27,11 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbA-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 quota: 50M
 threshold: 41%
+Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Another test
 

diff --git a/test/mail/0171.CALLER b/test/mail/0171.CALLER
index e053d52ebf086a1d8f966db20f5978f9529c783a..74a65676a70806912f5491e02079462e4e6d9006 100644 (file)
--- a/test/mail/0171.CALLER
+++ b/test/mail/0171.CALLER
@@ -3,9 +3,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 home: HOME=CALLER_HOME
 
 

diff --git a/test/mail/0173.userx b/test/mail/0173.userx
index 3178cb1ffd0d58c0861fe886062d87e5a623be45..e5448334c1be1b0e802c81ab13ba9d6daeb3e49c 100644 (file)
--- a/test/mail/0173.userx
+++ b/test/mail/0173.userx
@@ -7,9 +7,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
@@ -21,9 +21,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Another test message
 

diff --git a/test/mail/0173.usery b/test/mail/0173.usery
index 00d5a68dc6419e1700c3f55f84ecdf36c4a1bc33..f7da5ec651a54c55a1b3294a7cce317b5f649331 100644 (file)
--- a/test/mail/0173.usery
+++ b/test/mail/0173.usery
@@ -5,9 +5,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Another test message
 

diff --git a/test/mail/0173.userz b/test/mail/0173.userz
index 00d5a68dc6419e1700c3f55f84ecdf36c4a1bc33..f7da5ec651a54c55a1b3294a7cce317b5f649331 100644 (file)
--- a/test/mail/0173.userz
+++ b/test/mail/0173.userz
@@ -5,9 +5,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Another test message
 

diff --git a/test/mail/0174.CALLER b/test/mail/0174.CALLER
index faaa4bcaad910c3cddac312831f7558892e38212..a20d75abfd43c537933b08ffc18538c4acf6818b 100644 (file)
--- a/test/mail/0174.CALLER
+++ b/test/mail/0174.CALLER
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbD-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 X-Failed-Recipients: userx@non-local.example
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -27,9 +27,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Yet another test message
 

diff --git a/test/mail/0174.userx b/test/mail/0174.userx
index a80da164d2da6c036260e326fb92a04fdf3b3138..8ef0afb6c27cc971f63973c32bc32ec1a0a1156b 100644 (file)
--- a/test/mail/0174.userx
+++ b/test/mail/0174.userx
@@ -7,9 +7,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message
 
@@ -20,9 +20,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Another test message
 
@@ -33,9 +33,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Yet another test message
 

diff --git a/test/mail/0174.usery b/test/mail/0174.usery
index 6f5f5b4b34bccb3cfe496d1ae6517f42d50a27b9..e4bfa8a1e8b1e1ed3b1969b9a32201eeb9973aa9 100644 (file)
--- a/test/mail/0174.usery
+++ b/test/mail/0174.usery
@@ -5,9 +5,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Another test message
 

diff --git a/test/mail/0174.userz b/test/mail/0174.userz
index 6f5f5b4b34bccb3cfe496d1ae6517f42d50a27b9..e4bfa8a1e8b1e1ed3b1969b9a32201eeb9973aa9 100644 (file)
--- a/test/mail/0174.userz
+++ b/test/mail/0174.userz
@@ -5,9 +5,9 @@ Received: from CALLER by the.local.host.name with scanned-ok (Exim x.yz)
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Another test message
 

diff --git a/test/mail/0176.CALLER b/test/mail/0176.CALLER
index 292f12db65fc0556ce9d1d873236633fd4efaef0..0b5a235974b5922adef9f9bec8c26238af40d13f 100644 (file)
--- a/test/mail/0176.CALLER
+++ b/test/mail/0176.CALLER
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 X-Failed-Recipients: someone@somewhere
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -24,9 +24,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for someone@somewhere; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Some message or other.
 

diff --git a/test/mail/0177.CALLER b/test/mail/0177.CALLER
index caba8964973f1f884d6fa6e47c95825608e1ba47..b40823a03b48cba968d9d333d5341a04b7e25c48 100644 (file)
--- a/test/mail/0177.CALLER
+++ b/test/mail/0177.CALLER
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaZ-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 X-Failed-Recipients: userx@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -25,10 +25,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Subject: fail this
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a message to be failed.
 

diff --git a/test/mail/0177.userx b/test/mail/0177.userx
index fceff433efe1d4f221376f4bb4267cd4e2bab233..b1c66701f396b9a4b720f1db3cdb9a88118c9ace 100644 (file)
--- a/test/mail/0177.userx
+++ b/test/mail/0177.userx
@@ -3,10 +3,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbC-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 Subject: reply to this
+Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a message to be replied to.
 
@@ -15,10 +15,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 Subject: freeze this (1)
+Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a message to be frozen.
 
@@ -27,10 +27,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbE-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
 Subject: freeze this (2)
+Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a second message to be frozen.
 

diff --git a/test/mail/0177.usery b/test/mail/0177.usery
index 999c0a5c2cfa529e6b645aa8bb543a5ce91211b1..2fc9e36ea1da832669a71146f812b2c3e81a3958 100644 (file)
--- a/test/mail/0177.usery
+++ b/test/mail/0177.usery
@@ -2,14 +2,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 To: usery@test.ex
 Subject: auto fail message
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
 References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 failing userx@test.ex
 
@@ -17,14 +17,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmbB-0005vi-00
        for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 To: usery@test.ex
 Subject: auto freeze message
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
 References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 freezing userx@test.ex
 
@@ -32,14 +32,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmbD-0005vi-00
        for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 To: usery@test.ex
 Subject: An auto reply: qualify_domain=test.ex
 In-Reply-To: <E10HmbC-0005vi-00@the.local.host.name>
 References: <E10HmbC-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a text line
 
@@ -47,14 +47,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmbF-0005vi-00
        for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 To: usery@test.ex
 Subject: auto freeze message
 In-Reply-To: <E10HmbE-0005vi-00@the.local.host.name>
 References: <E10HmbE-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmbF-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 freezing userx@test.ex
 
@@ -62,14 +62,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmbH-0005vi-00
        for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
 To: usery@test.ex
 Subject: auto freeze message
 In-Reply-To: <E10HmbG-0005vi-00@the.local.host.name>
 References: <E10HmbG-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmbH-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 freezing userz@test.ex
 

diff --git a/test/mail/0182.userx b/test/mail/0182.userx
index b778e7efbc4b71ca6f0621bf3ad48a385c8209b8..3c666c667a710f241bbd0a4b3bd89d2a90ec93ae 100644 (file)
--- a/test/mail/0182.userx
+++ b/test/mail/0182.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-Added: by system filter
 X-Added: by system filter
 

diff --git a/test/mail/0189.userx b/test/mail/0189.userx
index 1e391afc474c3ae818c13ea942f3de59c7c4b088..eda035d5b5fb75a9449cb3aadbd6f633af4bfbc5 100644 (file)
--- a/test/mail/0189.userx
+++ b/test/mail/0189.userx
@@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message from an untrusted caller.
 
@@ -18,10 +18,10 @@ Received: from root by myhost.test.ex with local (Exim x.yz)
        (envelope-from <root@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 Sender: sender@some.domain
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <root@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message from a trusted caller....
 

diff --git a/test/mail/0192.userx b/test/mail/0192.userx
index 9cf0b1bca5dd9fec848670280789eaf318429d44..a55a9bb85eeb4a478a41a0cbeafa42a5ffd0e72f 100644 (file)
--- a/test/mail/0192.userx
+++ b/test/mail/0192.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: "Phil Q. Hazel" <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message which should get delivered.
 
@@ -14,9 +14,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: =?ISO-8859-1?Q?M=E8=E9_spaces=3A_funny=2C_char=5Facters?= <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message which should go over the threshold, but still
 be delivered.

diff --git a/test/mail/0194.CALLER b/test/mail/0194.CALLER
index 016cbc71dc68ff8369cd023046a527f711cc7a62..0a28b3f0e7b77c19ec46c7c1e728e9dfe6a2e73a 100644 (file)
--- a/test/mail/0194.CALLER
+++ b/test/mail/0194.CALLER
@@ -2,8 +2,6 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: userz@myhost.test.ex,
   usery@myhost.test.ex,
   userx@myhost.test.ex
@@ -11,6 +9,8 @@ Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -35,9 +35,9 @@ Return-path: <CALLER@myhost.test.ex>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 
@@ -45,8 +45,6 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmbA-0005vi-00
        for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: seven@myhost.test.ex,
   six@myhost.test.ex,
   five@myhost.test.ex,
@@ -58,6 +56,8 @@ Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -96,9 +96,9 @@ Return-path: <CALLER@myhost.test.ex>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Here's another message.
 
@@ -106,8 +106,6 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmbD-0005vi-00
        for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 X-Failed-Recipients: userz@myhost.test.ex,
   usery@myhost.test.ex,
   userx@myhost.test.ex
@@ -115,6 +113,8 @@ Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -142,10 +142,10 @@ Return-path: <CALLER@myhost.test.ex>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbC-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 ret: 99
+Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 More message 99
 

diff --git a/test/mail/0197.copies b/test/mail/0197.copies
index 45966b188512aa5826498ecdc8973f7a638652f2..49eeb21f2a629913963b55c745e6074d096fb01c 100644 (file)
--- a/test/mail/0197.copies
+++ b/test/mail/0197.copies
@@ -5,9 +5,9 @@ DATA
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test one.
 .
@@ -18,9 +18,9 @@ DATA
 Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        (envelope-from <doesn't@matter>)
        id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: doesn't@matter
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test two.
 .

diff --git a/test/mail/0202.userx b/test/mail/0202.userx
index 68774bb98dfef7acf4b9e71ea10c8a2f7fb2cc77..b3d6cfeaeb6e2a7bbe44004213e96c5426f1d725 100644 (file)
--- a/test/mail/0202.userx
+++ b/test/mail/0202.userx
@@ -3,11 +3,11 @@ Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 .: this is legal
 From: me@test.ex
+Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 This line follows ..
@@ -17,10 +17,10 @@ Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: me@test.ex
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
 This line follows ..
@@ -30,11 +30,11 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: me@test.ex
 ..: this really is legal
+Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .. two dots
 .
@@ -45,11 +45,11 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 From: me@test.ex
 ..: this really is legal
+Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 Sender: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .. two dots
 .

diff --git a/test/mail/0205.redirected b/test/mail/0205.redirected
index 6b9a415ed3153b568b4b728ad9bfd06eb139a03c..889ceb26d3507aa74da3d75cd9008ff9ff145db2 100644 (file)
--- a/test/mail/0205.redirected
+++ b/test/mail/0205.redirected
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for redirect@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Address-Data: >-redirect<
 
 

diff --git a/test/mail/0205.x b/test/mail/0205.x
index 622cba77f607ad500f2fbcfea8fc7e82cf469da1..cabaaf1cbe7570d4e01688071434f4fc41dbd1cb 100644 (file)
--- a/test/mail/0205.x
+++ b/test/mail/0205.x
@@ -2,9 +2,9 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 Address-Data: ><
 
 

diff --git a/test/mail/0210.file b/test/mail/0210.file
index efe155e6b70f4daa15884d78c6986403c9134db4..feb1225048dfd51d9de98b964c7d76dc0ed48b00 100644 (file)
--- a/test/mail/0210.file
+++ b/test/mail/0210.file
@@ -7,9 +7,9 @@ Envelope-to: file@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 .

diff --git a/test/mail/0210.pipe b/test/mail/0210.pipe
index bcb24731700d312d2ec296a7a6f3ba17ed00b372..4d976d64d4f75aa11589e8d9bdc407086a127e0b 100644 (file)
--- a/test/mail/0210.pipe
+++ b/test/mail/0210.pipe
@@ -6,9 +6,9 @@ Envelope-to: pipe@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This is a test message.
 .

diff --git a/test/mail/0211.CALLER b/test/mail/0211.CALLER
index 29a0e32b131b733021426f7601c102814cb48f1b..cd5f25b1a10e962f1801e7b687d3a732182457c9 100644 (file)
--- a/test/mail/0211.CALLER
+++ b/test/mail/0211.CALLER
@@ -3,13 +3,13 @@ Return-path: <>
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 X-Failed-Recipients: userx@domain1
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -27,9 +27,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 1
 
@@ -38,14 +38,14 @@ Return-path: <>
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbA-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 X-Failed-Recipients: usery@domain2,
   userx@domain1
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -65,9 +65,9 @@ Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test message 2
 

diff --git a/test/mail/0220.userx b/test/mail/0220.userx
index 02060801b46270397c79250874069d194de541b0..0eadbaa4162868ff2121aa17993a252cf18641b4 100644 (file)
--- a/test/mail/0220.userx
+++ b/test/mail/0220.userx
@@ -3,10 +3,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <foo@bar>)
        id 10HmaY-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <foo@bar>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From foo@bar Tue Mar 02 09:44:33 1999
@@ -14,10 +14,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <foo@bar>)
        id 10HmaZ-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <foo@bar>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From foo@bar Tue Mar 02 09:44:33 1999
@@ -25,10 +25,10 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <foo@bar>)
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <foo@bar>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From foo@bar Tue Mar 02 09:44:33 1999
@@ -36,10 +36,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <foo@bar>)
        id 10HmbB-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: foobydooby <foo@bar>
+Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
@@ -47,8 +47,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbF-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 

diff --git a/test/mail/0221.userx b/test/mail/0221.userx
index eed7e8eadcc50fb5414eb12ceb40cad73bd52657..b13a7d7a0266f42dc2902daed8de30ac4865b656 100644 (file)
--- a/test/mail/0221.userx
+++ b/test/mail/0221.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
@@ -13,9 +13,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
@@ -23,9 +23,9 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
@@ -33,9 +33,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbB-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: foobydooby <foo@bar>
+Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 

diff --git a/test/mail/0222.foo1 b/test/mail/0222.foo1
index 0342bd97cceba41898a67bcd65169732f7be5105..6db0b20c3a53d9bd85dc69271a51597e4edf3c32 100644 (file)
--- a/test/mail/0222.foo1
+++ b/test/mail/0222.foo1
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for foo1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 To: foo1@test.ex
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
 References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Auto reply message
 
@@ -16,13 +16,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        id 10HmbH-0005vi-00
        for foo1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbH-0005vi-00@myhost.test.ex>
 To: foo1@test.ex
 In-Reply-To: <E10HmbG-0005vi-00@myhost.test.ex>
 References: <E10HmbG-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmbH-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Auto reply message
 

diff --git a/test/mail/0222.foo2 b/test/mail/0222.foo2
index e48467d989006de068a321d7910d53d146daf7f5..a932aa023122eb0e34e2d23d8385c9437e5226d3 100644 (file)
--- a/test/mail/0222.foo2
+++ b/test/mail/0222.foo2
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        id 10HmbB-0005vi-00
        for foo2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 To: foo2@test.ex
 In-Reply-To: <E10HmbA-0005vi-00@myhost.test.ex>
 References: <E10HmbA-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Auto reply message
 

diff --git a/test/mail/0222.foo3 b/test/mail/0222.foo3
index 99e58473fbfbccf57e5623fb481b90fb6dc05130..5747305249b3491129dc356f5d5ee64c0416cc25 100644 (file)
--- a/test/mail/0222.foo3
+++ b/test/mail/0222.foo3
@@ -2,13 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        id 10HmbE-0005vi-00
        for foo3@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 To: foo3@test.ex
 In-Reply-To: <E10HmbD-0005vi-00@myhost.test.ex>
 References: <E10HmbD-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Auto reply message
 

diff --git a/test/mail/0223.CALLER b/test/mail/0223.CALLER
index 5b42d0548308039602b0ee7b649acbb7ccdf8de4..45eac6bfe6c7201de5760872c701c63ea5d63873 100644 (file)
--- a/test/mail/0223.CALLER
+++ b/test/mail/0223.CALLER
@@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@the.local.host.name>
 References: <E10HmaX-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test auto reply to first message
 
@@ -22,13 +22,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbB-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 To: CALLER_NAME <CALLER@test.ex>
 In-Reply-To: <E10HmbA-0005vi-00@the.local.host.name>
 References: <E10HmbA-0005vi-00@the.local.host.name>
 Auto-Submitted: auto-replied
+Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 From: EXIMUSER@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Test auto reply to third message
 

diff --git a/test/mail/0226.CALLER b/test/mail/0226.CALLER
index 2b3a998fa0c41db2a3455c0b00957f9f90d2d052..b2c29d123baf1567473472f8ffe88ebd978557cd 100644 (file)
--- a/test/mail/0226.CALLER
+++ b/test/mail/0226.CALLER
@@ -2,14 +2,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 X-Failed-Recipients: |/p/q/r@no.test.ex,
   /a/b/c@no.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -27,9 +27,9 @@ Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 1
 
@@ -37,13 +37,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbA-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 X-Failed-Recipients: |TESTSUITE/aux-fixed/showenv@yes.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
+Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 This message was created automatically by mail delivery software.
 
@@ -88,9 +88,9 @@ USER=|TESTSUITE/aux-fixed/showenv
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 2
 
@@ -102,9 +102,9 @@ Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 2
 

diff --git a/test/mail/0226.file b/test/mail/0226.file
index 79986490f16844fc33bd4a416be19808f370060d..27c3caf48e3fd294b96ab28a0ca3cf1d1637a532 100644 (file)
--- a/test/mail/0226.file
+++ b/test/mail/0226.file
@@ -2,9 +2,9 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 2
 

diff --git a/test/mail/0231.a b/test/mail/0231.a
index aef74170114f7346c3cc945266c0a769f2f61956..e83069fae614000e3239d8a76ec73b5bd7fd3081 100644 (file)
--- a/test/mail/0231.a
+++ b/test/mail/0231.a
@@ -2,11 +2,11 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From:     a-rewrite@test.ex, b@test.ex, a@domain1, b@domain1, a@domain3, b@domain3
 To:       a-rewrite@test.ex, b@test.ex, a@domain1, b@domain1, a@domain3, b@domain3
 Reply-to: a-rewrite@test.ex, b@test.ex, a@domain1, b@domain1, a@domain3, b@domain3
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 

diff --git a/test/mail/0231.b b/test/mail/0231.b
index 02e9daa6e6d3233c69d62b0e42784e666685af16..ef29f5fea1de2ac4872e99a1911bea198eb65bc0 100644 (file)
--- a/test/mail/0231.b
+++ b/test/mail/0231.b
@@ -2,11 +2,11 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From:     a@test.ex, b@test.ex, a@domain1, b@domain1, a@domain3, b@domain3
 To:       a@test.ex, b@test.ex, a@domain1, b@domain1, a@domain3, b@domain3
 Reply-to: a@test.ex, b@test.ex, a@domain1, b@domain1, a@domain3, b@domain3
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 

diff --git a/test/mail/0233.me b/test/mail/0233.me
index edd32e88685eced897e51e48744ee02dd632650f..1e9b1086cbf7983ff901806d67ef4cc826adebb4 100644 (file)
--- a/test/mail/0233.me
+++ b/test/mail/0233.me
@@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmaZ-0005vi-00
        for me@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: me@myhost.test.ex
 Subject: Message frozen
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 10HmaX-0005vi-00 has been frozen by the system filter.
 system filter freezes.
@@ -20,12 +20,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmbC-0005vi-00
        for me@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: me@myhost.test.ex
 Subject: Message frozen on arrival
+Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Message 10HmbB-0005vi-00 was frozen on arrival by ACL.
 The sender is <CALLER@myhost.test.ex>.
@@ -34,12 +34,12 @@