Correct header sorting for testsuite. Required manual patching, so maybe errors...

diff --git a/test/log/5100 b/test/log/5100
index ec4a807ffa2413c623f1e3945aad413ae7805d43..e11d37c0059f464704b3c8a09ba6e30dc1339df0 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
 <<< 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

-<<< script: 05
+<<< Date: Tue, 2 Mar 1999 09:44:33 +0000

 <<< Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 <<< Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>

+<<< script: 05

 <<< From: CALLER_NAME <CALLER@myhost.test.ex>
 <<< From: CALLER_NAME <CALLER@myhost.test.ex>

-<<< Date: Tue, 2 Mar 1999 09:44:33 +0000

 <<< 
 <<< This is a test message.
 <<< .
 <<< 
 <<< 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
 <<< 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

-<<< script: 06
+<<< Date: Tue, 2 Mar 1999 09:44:33 +0000

 <<< Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
 <<< Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>

+<<< script: 06

 <<< From: CALLER_NAME <CALLER@myhost.test.ex>
 <<< From: CALLER_NAME <CALLER@myhost.test.ex>

-<<< Date: Tue, 2 Mar 1999 09:44:33 +0000

 <<< 
 <<< This is a test message.
 <<< .
 <<< 
 <<< 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
 <<< 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

-<<< script: 08
+<<< Date: Tue, 2 Mar 1999 09:44:33 +0000

 <<< Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
 <<< Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>

+<<< script: 08

 <<< From: CALLER_NAME <CALLER@myhost.test.ex>
 <<< From: CALLER_NAME <CALLER@myhost.test.ex>

-<<< Date: Tue, 2 Mar 1999 09:44:33 +0000

 <<< 
 <<< This is a test message.
 <<< .
 <<< 
 <<< 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
 <<< 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

-<<< script: 09
+<<< Date: Tue, 2 Mar 1999 09:44:33 +0000

 <<< Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
 <<< Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>

+<<< script: 09

 <<< From: CALLER_NAME <CALLER@myhost.test.ex>
 <<< From: CALLER_NAME <CALLER@myhost.test.ex>

-<<< Date: Tue, 2 Mar 1999 09:44:33 +0000

 <<< 
 <<< This is a test message.
 <<< .
 <<< 
 <<< This is a test message.
 <<< .

diff --git a/test/log/5101 b/test/log/5101
index 5820439f5d6f365107571eb5cbdb180dd408fc14..c0c3856b30186cee069fca5f0961dd1caca6e8ae 100644 (file)
--- a/test/log/5101
+++ b/test/log/5101
@@ -23,10 +23,10 @@ DATA
 <<< 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
 <<< 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

-<<< mailbox: copied
+<<< Date: Tue, 2 Mar 1999 09:44:33 +0000

 <<< Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 <<< Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

+<<< mailbox: copied

 <<< From: CALLER_NAME <CALLER@myhost.test.ex>
 <<< From: CALLER_NAME <CALLER@myhost.test.ex>

-<<< Date: Tue, 2 Mar 1999 09:44:33 +0000

 <<< 
 <<< This is a test message.
 <<< Here's a new line.
 <<< 
 <<< This is a test message.
 <<< Here's a new line.


@@ -69,9 +69,9 @@ DATA
 <<< 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
 <<< 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>
 <<< Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 <<< From: CALLER_NAME <CALLER@myhost.test.ex>

-<<< Date: Tue, 2 Mar 1999 09:44:33 +0000

 <<< 
 <<< This is another test message.
 <<< Here's a new line.
 <<< 
 <<< This is another test message.
 <<< Here's a new line.

diff --git a/test/mail/0005.CALLER b/test/mail/0005.CALLER
index 1b73cc347922f71e8e082a412c7d35b2eb503f79..0d795f63652998fc5a39b21494dbe84d34f728fd 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
        (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
 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
 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
        (envelope-from <someone@some.domain>)
        id 10HmaY-0005vi-00
        for CALLER@the.local.host.name; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: second
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaY-0005vi-00.a-b-c-@some.domain>
 Message-Id: <E10HmaY-0005vi-00.a-b-c-@some.domain>

+Subject: second

 From: someone@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
 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
        (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
 Subject: third
 Reply-to: some@body

-Message-Id: <E10HmaZ-0005vi-00.a-b-c-@some.domain>

 From: someone@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
 X-acl-message-linecount: 4
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 1

diff --git a/test/mail/0006.CALLER b/test/mail/0006.CALLER
index 627bc16bce6c41748141e842eb957793e3fb24a0..162bcd05967e438dd00956c0206c998368d50854 100644 (file)
--- a/test/mail/0006.CALLER
+++ b/test/mail/0006.CALLER
@@ -5,11 +5,11 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
        (envelope-from <someone@some.where>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
        (envelope-from <someone@some.where>)
        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:<someone@some.where>
 To: Recipients not given:;
 X-Test: (=?iso-8859-8?b?7eXs+SDv4SDp7Oj08A==?=)
 From:<someone@some.where>
 To: Recipients not given:;
 X-Test: (=?iso-8859-8?b?7eXs+SDv4SDp7Oj08A==?=)

-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message Headers:
 Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
 
 Message Headers:
 Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)

diff --git a/test/mail/0008.CALLER b/test/mail/0008.CALLER
index 0a54f1f4d52dde18251c1b13bd3872c03e774c09..15ccf08caf0be1e3746f4ceee9426fd2cf216062 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
        (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
 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
 
 Here is testing data
 .that line started with a dot

diff --git a/test/mail/0009.CALLER b/test/mail/0009.CALLER
index b4806a18dfd8ea1b8860f618c41a314a9d3e1c48..c6bc2c961f25e4efe5caea3d032f9934d8d8d445 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
        (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
 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
 
 Here is testing data
 .that line started with a dot

diff --git a/test/mail/0010.CALLER b/test/mail/0010.CALLER
index b4806a18dfd8ea1b8860f618c41a314a9d3e1c48..c6bc2c961f25e4efe5caea3d032f9934d8d8d445 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
        (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
 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
 
 Here is testing data
 .that line started with a dot

diff --git a/test/mail/0011.CALLER b/test/mail/0011.CALLER
index b4806a18dfd8ea1b8860f618c41a314a9d3e1c48..c6bc2c961f25e4efe5caea3d032f9934d8d8d445 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
        (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
 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
 
 Here is testing data
 .that line started with a dot

diff --git a/test/mail/0014.userx b/test/mail/0014.userx
index 8844387dcb24719c6d79d6a8170fe0bccee9bf64..956382bd326f7294ba054e14dd3bdfac8c228544 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
        (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
 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
 
 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   
 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 2f531e675896e61fd70b9ba042efa2f067eea07b..f617ace68c6495e4accab3c6d96625939fca223f 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
 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
 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: 
 
 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
        (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>
 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.
 
 
 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
 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
 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: 
 
 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
        (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>
 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.
 
 
 Some more message text.
 

diff --git a/test/mail/0015.userx b/test/mail/0015.userx
index 29b1e9a9507a153ff1141ad1e756ada8f9615b06..2112b7100b100d7eb50ccdfaec94cc99ba8d3a51 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
        (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>
 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+
 
 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
 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
 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>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 X-local_part: userx
 X-local_part_prefix: 
 
 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
        (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>
 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+
 
 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
 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
 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>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 X-local_part: userx
 X-local_part_prefix: 
 
 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
        (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>
 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+
 
 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
 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>
 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-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
 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>
 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+
 
 X-local_part: userx
 X-local_part_prefix: x+
 

diff --git a/test/mail/0016.userx b/test/mail/0016.userx
index 8e33c3631b0d10193240245cf353c761a4132e68..3f0451c3ca45d9e43c82049498e199a161b4585d 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
        (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>
 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.
 
 
 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
 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
 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>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 callpager -r 108 PAGE:Some message text. 
 
 
 callpager -r 108 PAGE:Some message text. 
 

diff --git a/test/mail/0021.ok b/test/mail/0021.ok
index 213d0c60a3db27ff8d52f4c310d93f55817ef393..e29b128327fd734b9ec4ca24117f6f386cc385f4 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
 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
 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:
 
 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
        (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
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: ok@test2

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message 3.
 
 
 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
 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
 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:
 
 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
        (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
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: ok@test4

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message 5.
 
 
 Test message 5.
 

diff --git a/test/mail/0021.userx b/test/mail/0021.userx
index 2abd8d3150adc6474e3b389cb3fcfacf84ee8021..b8b130f7620eff82ea61405e7f561bb8731b2c54 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
 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
 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:
 
 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
        (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
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: userx@test1

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message 1.
 
 
 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
        (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
 Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 From: ok@test1

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message 2.
 
 
 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
        (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
 Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
 From: ok@test3

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message 4.
 
 
 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
 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
 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:
 
 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
 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
 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:
 
 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
        (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
 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 791683ab7ef84121440bdc3de092b02d33aec9de..791a3266ae9915a1f17e4b79865823c3f6913577 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
 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>
 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
 
 
 Message 1
 

diff --git a/test/mail/0026.userx b/test/mail/0026.userx
index 4c78221971d8fdce03010f9559713749e9ce97c1..c9a8874b48284753eaf252a784755060126dacc5 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
        (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
 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
 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
        (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;
 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
 From: x@y

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 X-warning: this is a test warning
 
 Message 10
 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
 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
 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
 X-warning: this is a test warning
 
 Message 11

diff --git a/test/mail/0031.CALLER b/test/mail/0031.CALLER
index d996dc047d0cac2089bdcd64b7c109101ec2499c..ef8774a37067cb511b31eacaf46e1886c4a7f1c4 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
        (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>
 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.
 
 
 This is a test message 1.
 

diff --git a/test/mail/0032.CALLER b/test/mail/0032.CALLER
index 95051c4d9db850842e8c60bfff90ba326cb60dcc..2c3c866be1c2846be274b630a2d6df4964ef424b 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
 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
 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.
 
 
 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
        (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>
 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.
 
 
 This is a test message.
 

diff --git a/test/mail/0036.abcd b/test/mail/0036.abcd
index 1c9503859da2a3788c8b77cb9ca4f1af4d2a4c94..63fc8aad90faaf860978ac686223e02910bc38df 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
 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

-To: userx@alias-eximtesthost.test.ex, abcd@eximtesthost.test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

+To: userx@alias-eximtesthost.test.ex, abcd@eximtesthost.test.ex

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message
 
 
 Test message
 

diff --git a/test/mail/0036.userx b/test/mail/0036.userx
index 1c9503859da2a3788c8b77cb9ca4f1af4d2a4c94..63fc8aad90faaf860978ac686223e02910bc38df 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
 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

-To: userx@alias-eximtesthost.test.ex, abcd@eximtesthost.test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

+To: userx@alias-eximtesthost.test.ex, abcd@eximtesthost.test.ex

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message
 
 
 Test message
 

diff --git a/test/mail/0037.CALLER b/test/mail/0037.CALLER
index 93711697d4a08f7230e26b326d44731045858c70..d3aa4fbff19ffff829c7cfbb8808d3ad7ba5bfd4 100644 (file)
--- a/test/mail/0037.CALLER
+++ b/test/mail/0037.CALLER
@@ -5,6 +5,8 @@ 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
 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
 X-Failed-Recipients: usery@test.ex,
   abcd@test.ex,
   userx@test.ex


@@ -12,8 +14,6 @@ Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail delivery failed: returning message to sender
 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.
 
 
 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
 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

-Subject: should fail this
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>

+Subject: should fail this

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 X-added: qualify_domain is test.ex
 
 Fail this.
 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
 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
 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
 From: CALLER@test.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a text line
 
 
 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
 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
 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.
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbE-0005vi-00
        for filter-pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: should give filter error (1)
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbE-0005vi-00@the.local.host.name>

+Subject: should give filter error (1)

 From: CALLER_NAME <CALLER@test.ex>
 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
 
 


@@ -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
 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
 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.
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbG-0005vi-00
        for filter-file@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: should give filter error (2)
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbG-0005vi-00@the.local.host.name>

+Subject: should give filter error (2)

 From: CALLER_NAME <CALLER@test.ex>
 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
 
 


@@ -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
 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
 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.
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbI-0005vi-00
        for filter-lookup@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: should give filter error (3)
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbI-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbI-0005vi-00@the.local.host.name>

+Subject: should give filter error (3)

 From: CALLER_NAME <CALLER@test.ex>
 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
 
 


@@ -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
 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
 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.
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbK-0005vi-00
        for filter-exists@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: should give filter error (4)
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbK-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbK-0005vi-00@the.local.host.name>

+Subject: should give filter error (4)

 From: CALLER_NAME <CALLER@test.ex>
 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
 
 


@@ -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
 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
 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.
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbM-0005vi-00
        for filter-readfile@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: should give filter error (5)
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbM-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbM-0005vi-00@the.local.host.name>

+Subject: should give filter error (5)

 From: CALLER_NAME <CALLER@test.ex>
 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
 
 


@@ -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
 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
 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.
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbO-0005vi-00
        for filter-run@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: should give filter error (6)
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbO-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbO-0005vi-00@the.local.host.name>

+Subject: should give filter error (6)

 From: CALLER_NAME <CALLER@test.ex>
 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
 
 


@@ -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
 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
 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
 From: CALLER@test.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 this is vacation text
 
 
 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
 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
 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.
 
 
 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
        (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>
 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.
 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
 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
 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.
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmcA-0005vi-00
        for filter-stat@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: should give filter error (7)
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmcA-0005vi-00@the.local.host.name>
 Message-Id: <E10HmcA-0005vi-00@the.local.host.name>

+Subject: should give filter error (7)

 From: CALLER_NAME <CALLER@test.ex>
 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
 
 


@@ -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
 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
 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
 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 cf539f85edecb9c3696bba9b7325b3e12118eaeb..a57f4833d46e73d1780a98d3e614f45d07440ecc 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
        (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>
 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
 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 f7c2aea5095d59544037ed4d938dbe786cbfb51f..90b2408e49b1292a5013f78d91dd1b457b2d1e77 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
 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
 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" 
 
 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
 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
 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" 
 
 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 8a5e9a1b58684298e40dc860a772c11f1a41dfc9..6243b66bbc6b07ca102eb35b562bb76d77df977e 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: Test 1
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

+Subject: Test 1

 From: CALLER_NAME <CALLER@test.ex>
 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
 
 


@@ -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
        (envelope-from <CALLER@test.ex>)
        id 10HmbC-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: reply to this
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>

+Subject: reply to this

 From: CALLER_NAME <CALLER@test.ex>
 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.
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: should freeze this
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>

+Subject: should freeze this

 From: CALLER_NAME <CALLER@test.ex>
 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
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbS-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: should freeze this
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbS-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbS-0005vi-00@the.local.host.name>

+Subject: should freeze this

 From: CALLER_NAME <CALLER@test.ex>
 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
 
 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
        (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>
 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
 
 
 X-added: qualify_domain is test.ex
 
 

diff --git a/test/mail/0037.userz b/test/mail/0037.userz
index ae2f0e01af0ba8983247bb02b1a8e3cec09c6b64..ec84231886cb4aa4e079f4542a226ecfaffdb83d 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: Test 1
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

+Subject: Test 1

 From: CALLER_NAME <CALLER@test.ex>
 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
 
 


@@ -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
 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

-Subject: should fail this
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>

+Subject: should fail this

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 X-added: qualify_domain is test.ex
 
 Fail this.
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: should freeze this
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>

+Subject: should freeze this

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 X-added: qualify_domain is test.ex
 
 Freeze this.
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbC-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: reply to this
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>

+Subject: reply to this

 From: CALLER_NAME <CALLER@test.ex>
 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.
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbS-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: should freeze this
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbS-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbS-0005vi-00@the.local.host.name>

+Subject: should freeze this

 From: CALLER_NAME <CALLER@test.ex>
 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).
 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
        (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>
 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.
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: should defer this
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbY-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbY-0005vi-00@the.local.host.name>

+Subject: should defer this

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 X-added: qualify_domain is test.ex
 
 Defer this.
 X-added: qualify_domain is test.ex
 
 Defer this.

diff --git a/test/mail/0048.CALLER b/test/mail/0048.CALLER
index 11101b61dd38367bb8c0151930cdbbdf2f8ea200..9050b95ee99e044f58be3af20a2d2f7ce86dd87c 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
 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
 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.
 
 
 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
        (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>
 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.
 
 
 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
        (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>
 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.
 
 
 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
 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
 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.
 
 
 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
        (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>
 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
 
 
 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
        (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>
 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
 
 
 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
 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
 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.
 
 
 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
        (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>
 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
 
 
 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
        (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>
 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
 
 
 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
 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
 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.
 
 
 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
        (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>
 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
 
 
 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
        (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>
 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
 
 
 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
 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
 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.
 
 
 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
        (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>
 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.
 
 
 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
        (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>
 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.
 
 
 Some message text.
 

diff --git a/test/mail/0049.userx b/test/mail/0049.userx
index c6e4b19f9923d017b9892f8578c476b0a0b4c915..2028319eadbadb048374c20b885e647a69368541 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
        (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>
 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.
 
 
 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
        (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>
 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.
 
 
 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
        (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>
 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.
 
 
 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
        (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>
 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.
 
 
 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
        (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>
 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.
 
 
 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
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbC-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-From: From person <from@some.where>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbC-0005vi-00@myhost.ex>
 Message-Id: <E10HmbC-0005vi-00@myhost.ex>

+From: From person <from@some.where>

 Sender: CALLER_NAME <CALLER@myhost.ex>
 Sender: CALLER_NAME <CALLER@myhost.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message.
 
 
 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
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbD-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-From: From person <from@some.where>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbD-0005vi-00@myhost.ex>
 Message-Id: <E10HmbD-0005vi-00@myhost.ex>

+From: From person <from@some.where>

 Sender: CALLER_NAME <CALLER@myhost.ex>
 Sender: CALLER_NAME <CALLER@myhost.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message.
 
 
 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
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbE-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-From: From person <from@some.where>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbE-0005vi-00@myhost.ex>
 Message-Id: <E10HmbE-0005vi-00@myhost.ex>

+From: From person <from@some.where>

 Sender: CALLER_NAME <CALLER@myhost.ex>
 Sender: CALLER_NAME <CALLER@myhost.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message.
 
 
 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
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbF-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-From: From person <from@some.where>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbF-0005vi-00@myhost.ex>
 Message-Id: <E10HmbF-0005vi-00@myhost.ex>

+From: From person <from@some.where>

 Sender: CALLER_NAME <CALLER@myhost.ex>
 Sender: CALLER_NAME <CALLER@myhost.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message.
 
 
 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
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbG-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-From: From person <from@some.where>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbG-0005vi-00@myhost.ex>
 Message-Id: <E10HmbG-0005vi-00@myhost.ex>

+From: From person <from@some.where>

 Sender: CALLER_NAME <CALLER@myhost.ex>
 Sender: CALLER_NAME <CALLER@myhost.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message.
 
 
 This is a test message.
 

diff --git a/test/mail/0050.userx b/test/mail/0050.userx
index 4d209dcd1c45ecda13915d9cf4c33b81fd60f9ca..706b3c3b77000a058a861d119aa1c844d3cbef51 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
        (envelope-from <CALLER@myhost.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Sender: Sender in original <sender@original.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@myhost.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.ex>

+Sender: Sender in original <sender@original.ex>

 From: CALLER_NAME <CALLER@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message 1.
 
 
 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
        (envelope-from <userx@outside.ex>)
        id 10HmaY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Sender: Sender in original <sender@original.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaY-0005vi-00@myhost.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.ex>

+Sender: Sender in original <sender@original.ex>

 From: userx@outside.ex
 From: userx@outside.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message 2.
 
 
 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
        (envelope-from <userx@outside.ex>)
        id 10HmaZ-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Sender: Sender in original <sender@original.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaZ-0005vi-00@myhost.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.ex>

+Sender: Sender in original <sender@original.ex>

 From: userx@outside.ex
 From: userx@outside.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message 3.
 
 
 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
        (envelope-from <userx@elsewhere.ex>)
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Sender: Sender in original <sender@original.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbA-0005vi-00@myhost.ex>
 Message-Id: <E10HmbA-0005vi-00@myhost.ex>

+Sender: Sender in original <sender@original.ex>

 From: userx@elsewhere.ex
 From: userx@elsewhere.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message 4.
 
 
 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
        (envelope-from <userx@cus.cam.ac.uk>)
        id 10HmbB-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Sender: Sender in original <sender@original.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbB-0005vi-00@myhost.ex>
 Message-Id: <E10HmbB-0005vi-00@myhost.ex>

+Sender: Sender in original <sender@original.ex>

 From: userx@cus.cam.ac.uk
 From: userx@cus.cam.ac.uk

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message 5.
 
 
 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
        (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>
 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.
 
 
 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
        (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>
 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.
 
 
 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
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbE-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-From: From person <from@some.where>
-Message-Id: <E10HmbE-0005vi-00@myhost.ex>

 Date: 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>

 
 This is a test message 8.
 
 
 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
        (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>
 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.
 
 
 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
        (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>
 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.
 
 
 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
        (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>
 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.
 
 
 This is a test message 11.
 

diff --git a/test/mail/0051.CALLER b/test/mail/0051.CALLER
index 322a48d746a0ce4d89f45f18f94122e873b814d8..04882a83de535580f0ff1de2b5b2ffa89d81e90f 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
 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
 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.
 
 
 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
        (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>
 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.
 
 
 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
 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
 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.
 
 
 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
        (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>
 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.
 
 
 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
 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
 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.
 
 
 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
        (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>
 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.
 
 
 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
 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
 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.
 
 
 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
        (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>
 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.
 
 
 This is a test message 6.
 

diff --git a/test/mail/0051.userx b/test/mail/0051.userx
index 7e0caa91c49b8d2086c52b0c3cb65e459e5a3f8c..e03511072800c940d50617578bc52c1eb2f20cd9 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
        (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>
 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.
 
 
 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
        (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>
 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.
 
 
 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
        (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>
 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.
 
 
 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
        (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>
 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.
 
 
 This is a test message 8.
 

diff --git a/test/mail/0052.!one b/test/mail/0052.!one
index 9e4c91494ca428124d210fb61281e38e8082d4b5..b517d8a4057b21de391ccbf1ed308a2ddd3de76d 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
        (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>
 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.
 
 
 This is a test message 3.
 

diff --git a/test/mail/0052.CALLER b/test/mail/0052.CALLER
index 7e0fb955d79c803730391215e5d8c2308c4c5d97..6cd2cdefd2c24b748ffe873ef06a78d4bb36b47a 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
 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
 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.
 
 
 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
        (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>
 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.
 
 
 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
 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
 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.
 
 
 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
        (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>
 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.
 
 
 This is a test message 4.
 

diff --git a/test/mail/0052.yy99 b/test/mail/0052.yy99
index 1ebddcbe9e0c5355a630904b24267689a53d2a75..b79785c2067f071f442adf591ef8d781fe0c0885 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
        (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>
 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.
 
 
 This is a test message 2.
 

diff --git a/test/mail/0055.userx b/test/mail/0055.userx
index d31bc4ab298b6029ad18b3999e0dcfc4542a97be..975e3db7e2dc4b295d21b8705df937b7ffd836d7 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
        (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>
 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 5199f679ab5f2b438c5a4cfb05e1e1916a24925a..7ea62885b3f4379d2deb1a36199cb4c292aa15cd 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
 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
 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
 From: EXIMUSER@test.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test auto reply to first message; non-printer >\n <
 
 
 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
 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
 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
 From: EXIMUSER@test.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test auto reply to third message
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: third message
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>

+Subject: third message

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This has return_message set.
 
 
 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
 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
 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
 From: EXIMUSER@test.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test auto reply to third message
 
 
 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
 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
 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
 From: EXIMUSER@test.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test auto reply to third message
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbE-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: third message
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbE-0005vi-00@the.local.host.name>

+Subject: third message

 From: CALLER_NAME <CALLER@test.ex>
 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
 
 
 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
 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
 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
 From: EXIMUSER@test.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test auto reply to Encoded from
 
 
 Test auto reply to Encoded from
 

diff --git a/test/mail/0073.CALLER b/test/mail/0073.CALLER
index 45eac6bfe6c7201de5760872c701c63ea5d63873..5b42d0548308039602b0ee7b649acbb7ccdf8de4 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
 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
 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
 From: EXIMUSER@test.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test auto reply to first message
 
 
 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
 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
 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
 From: EXIMUSER@test.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test auto reply to third message
 
 
 Test auto reply to third message
 

diff --git a/test/mail/0074.CALLER b/test/mail/0074.CALLER
index 667c731394b86abb7e8bf9c3c9a572ac44630765..28c9f6a9e60c8801209a44287581dd754bcc07eb 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
 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
 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>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Auto reply to first message
 
 
 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
 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
 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>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Auto reply to third message
 
 
 Auto reply to third message
 

diff --git a/test/mail/0074.userx b/test/mail/0074.userx
index fb5be8ac13ed6426f1b0dd04e5d23b4696366ed8..637092558df8a96c43ff8f4d8720f68344f12db6 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: first message
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

+Subject: first message

 From: CALLER_NAME <CALLER@test.ex>
 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
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: second message
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>

+Subject: second message

 From: CALLER_NAME <CALLER@test.ex>
 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
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: third message
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>

+Subject: third message

 From: CALLER_NAME <CALLER@test.ex>
 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
 
 
 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
        (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
 Subject: fourth message
 X-nltest: xxxx

-Message-Id: <E10HmbC-0005vi-00@the.local.host.name>

 From: CALLER_NAME <CALLER@test.ex>
 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
 
 
 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
 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
 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>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Testing, testing
 
 
 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
        (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
 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>
 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
 
 
 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
 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
 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>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 To reply-to
 
 
 To reply-to
 

diff --git a/test/mail/0075.subdir/userx b/test/mail/0075.subdir/userx
index 40bcd43f78417cb0f75330be5ef67f7e382388dc..b30566ab455c2137277ec17bf24f853e16396e4d 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: first message
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

+Subject: first message

 From: CALLER_NAME <CALLER@test.ex>
 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 7a5b5233cfbae1e387e77ccafea741b932bbec9a..a76777584196d8b54197ffa2f43af6491d5a433d 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
        (envelope-from <postmaster@exim.test.ex>)
        id 10HmaZ-0005vi-00
        for userx@exim.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-sysmail: yes
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>

+sysmail: yes

 From: postmaster@exim.test.ex
 From: postmaster@exim.test.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Testing mail from system filter
 
 
 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
 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
 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
 From: CALLER@exim.test.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 testing testing
 
 
 testing testing
 

diff --git a/test/mail/0081.userx b/test/mail/0081.userx
index 4f0d895b0a88d97bb5686c95c93a88baa7ce0153..417bb1ec388549f19a043ff0c46aac712e6df1b9 100644 (file)
--- a/test/mail/0081.userx
+++ b/test/mail/0081.userx
@@ -6,6 +6,8 @@ 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
        (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.
 X-one: This is the first text.
 To: userx@exim.test.ex
 X-one: This is the second text.


@@ -13,8 +15,6 @@ From: userx@exim.test.ex
 X-one: This is the third text.
 Subject: testing, testing
 X-one: This is the fourth text.
 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.
 
 
 This is the message body.
 

diff --git a/test/mail/0082.userx b/test/mail/0082.userx
index 17116627931b9049fed02fc0863cab21e417da6a..4f81ce483d143515c72f37776ae06cd1b3eda10d 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
        (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
 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
 Proto: testproto
 
 This is some text

diff --git a/test/mail/0083.userx b/test/mail/0083.userx
index 994175b684267f852b09cfd0e00ed4d82ca4a54f..3af56820c976acddb35be8b6b564b29985e5b2f1 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
        (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
 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
 Proto: local-bsmtp
 
 This is some text

diff --git a/test/mail/0090.CALLER b/test/mail/0090.CALLER
index 14156674a41d11df4e1b7c2f91d40fedf187aca6..c778822b7be8036fc0bc911d44a6a1ebab74f1f1 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
 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
 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
 From: EXIMUSER@myhost.test.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is an autogenerated message.
 
 
 This is an autogenerated message.
 

diff --git a/test/mail/0095.userx b/test/mail/0095.userx
index bd5e61c81f21d3237abd2f732374a5925d54fa78..238daeb36e8937e3d55653cd0df8c339a12f41b9 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
        (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>
 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
 
 
 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
        (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
 quota: 0
 threshold: 10

-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message
 
 
 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
        (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
 quota: 10K
 threshold: 900

-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 A test message
 
 
 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
 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
 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
 
 
 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
        (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%
 quota: 2200
 threshold: 90%

-Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message
 
 
 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
 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
 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).
 
 
 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
        (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>
 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
 
 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
        (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>
 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
 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

diff --git a/test/mail/0095.userz b/test/mail/0095.userz
index f10b3ea30d5c5c42f8b2a71a59e0af10e585cd6a..2720b972def8c8ae04195648f06229ca7780c32d 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
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbG-0005vi-00
        for userz@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-threshold: 330
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>

+threshold: 330

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 X:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 
 
 X:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 
 

diff --git a/test/mail/0095.userz.bounce b/test/mail/0095.userz.bounce
index 840e40fd59eb37cd197ff03149ddc373b575d638..bf73931fe048dafac43e79a24d0ea0ba11a7ebee 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
 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
 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).
 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 1dadfc4cef05d8be733619a2b7bf7ee0156d8917..2cb54cc5b9dfbb403a0d97678e3c4f9d315a453f 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: First message subject
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

+Subject: First message subject

 From: CALLER_NAME <CALLER@test.ex>
 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
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-X-RBL-Warning: A faked up RBL header
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>

+X-RBL-Warning: A faked up RBL header

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 Added: xxxx
 
 
 Added: xxxx
 
 

diff --git a/test/mail/0097.userx b/test/mail/0097.userx
index 1c062a26478adf4c6f6a05ecedfdadd11fc39a10..299a89e322ce528a3cdc701525c0f95d1afac804 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: First message subject
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

+Subject: First message subject

 From: CALLER_NAME <CALLER@test.ex>
 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
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-X-RBL-Warning: A faked up RBL header
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>

+X-RBL-Warning: A faked up RBL header

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 Added: by router
 Added: by transport
 
 Added: by router
 Added: by transport
 

diff --git a/test/mail/0098.CALLER b/test/mail/0098.CALLER
index 532931db04f06349b6bec05b4b383fda7592a622..ecf48dad0e12fb0eb43bcaa274b3917ab4f454f8 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
 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
 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
 
 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
 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
 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
 
 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
 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
 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
 
 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
 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
 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
 
 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
 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
 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
 
 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
 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
 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
 
 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
 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
 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
 
 warn_message_delay      = 0 minutes
 warn_message_recipients = CALLER@test.ex

diff --git a/test/mail/0100.CALLER b/test/mail/0100.CALLER
index 49db745bf87014a113990ea7fef2f7f32e4674d4..fbfaf7da0f178e28421b422605d31a4bf885d508 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
 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>
 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
 
 A message containing
 . a line starting with a dot

diff --git a/test/mail/0100.userw b/test/mail/0100.userw
index 3906e41a9013cc77fa9f3ba8cffa194412bd10ed..15bffa91fe85c880674e7b487617dc4ccc66ae88 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
        (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>
 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
 
 A message containing
 .. a line starting with a dot

diff --git a/test/mail/0100.userx b/test/mail/0100.userx
index 1de79e03f4d8f8fb5a2c2f4a9d7aea7a6384b90a..c00830065fbcce8776bcbc4cf7edff3c6076ffb7 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
        (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>
 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
 
 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
        (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>
 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
 
 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
        (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>
 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
 
 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
        (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>
 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
 
 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
        (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>
 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
 
 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
        (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>
 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
 
 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
        (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>
 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
 
 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
        (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>
 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:
 .
 
 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
        (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>
 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 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbL-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: From
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbL-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbL-0005vi-00@the.local.host.name>

+Subject: From

 From: CALLER_NAME <CALLER@test.ex>
 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.
 
 >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 a7f4709782e0d7f9ae4feced3e397eedbd342f7e..f79004b7a8f1204572ce295ae10a2c7cb633b23f 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
        (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>
 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
 
 Test message
 From the deep abyss

diff --git a/test/mail/0100.userz b/test/mail/0100.userz
index 41f2f9883b1acd27f4e272229773c3861bfa8114..8d7d5afa5c3979e8f070d4c3a02320c933cc9713 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
        (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>
 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
 
 A message containing
 .. a line starting with a dot

diff --git a/test/mail/0101.userx b/test/mail/0101.userx
index 4848398b4534fb9ac3b351b763e429b2914f331d..a9bf95600d7583f047b5210c6baff0ff8dfaaa1c 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
        (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>
 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
 
 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
        (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>
 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
 
 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
        (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>
 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
 
 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
        (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>
 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
 
 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
        (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>
 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
 
 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
        (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>
 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
 
 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
        (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>
 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
 
 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
        (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>
 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:
 .
 
 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
        (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>
 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 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbI-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: From
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbI-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbI-0005vi-00@the.local.host.name>

+Subject: From

 From: CALLER_NAME <CALLER@test.ex>
 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.
 
 >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 a340c343f66612b012c2451023dc5df56ba6ee23..81763e04ab87c318951dc045bd9e48d9db52726d 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
        (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>
 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
 
 A message containing
 .. a line starting with a dot

diff --git a/test/mail/0102.batched b/test/mail/0102.batched
index 2160dc31c790bb61dac6e346a057b4519229049b..acfab6b94d008f40b242a15e7030fb8300b0cbc7 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
        (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>
 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
 .
 
 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
 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>
 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
 .
 
 Test to batch-userx and batch-usery
 .

diff --git a/test/mail/0102.userx b/test/mail/0102.userx
index 2b5ed9885d9df5c835bbd6aae96a09799fed06f9..2131c64978d7be326adcd9bd3d81750fe80b6ae1 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
        (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>
 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.
 
 
 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
        (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>
 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.
 
 
 Second test message, no prefix.
 

diff --git a/test/mail/0102.usery b/test/mail/0102.usery
index b3cca92ca9bf1d806a492c741fe7720bf67a8e44..0e4d34cf139bcedf93035aa72bbb7a1d69dcc56e 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
        (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>
 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
 .
 
 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
        (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>
 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.
 .
 
 Second test message, no prefix.
 .

diff --git a/test/mail/0102.userz b/test/mail/0102.userz
index 2a8c4ad7f8a8a336bd6bb74cd0b6c508cd8380dd..c32c363cf97da778757f8573e656957d1ed2f89f 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
        (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>
 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
 
 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
        (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>
 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
 
 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
        (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>
 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
 
 Second test message, no prefix.
 \ 1\ 1\ 1\ 1

diff --git a/test/mail/0103.CALLER b/test/mail/0103.CALLER
index f8ac3c475e68eacbbcaf3ae2ae56e8b6455a0587..ba79910f9c25151e2e86d6a974eeba93efea330a 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
 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
 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.
 
 
 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
        (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>
 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.
 
 
 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
 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
 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.
 
 
 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
        (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>
 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
 
 
 Message sent to ":fail: fail message"@special
 

diff --git a/test/mail/0103.rewritten b/test/mail/0103.rewritten
index c01a105ab9a1facff8cf185dcca51540fd42db4d..17b6118eb8a057caf99ce707ad6da7048c0cc91e 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
        (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>
 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.
 
 
 Message sent to "xyz@x.y.z"@test.ex.
 

diff --git a/test/mail/0104.mmm b/test/mail/0104.mmm
index bc92557765f1bb0811becb801a8ebb1fef2e4ff2..44da908388b2e910689468b8b005f2bc4692b791 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for mmm@ten-1; Tue, 2 Mar 1999 09:44:33 +0000

-To: You <mmm@ten-1.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>

+To: You <mmm@ten-1.test.ex>

 From: CALLER_NAME <CALLER@test.ex>
 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 4096709e3f8a9241d8c4321d1327bd02cafe5fdd..3aa7b0dd68386e04f34d2e3cd1029626f80e92c4 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for yyy@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-To: comment <yyy@test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

+To: comment <yyy@test.ex>

 From: CALLER_NAME <CALLER@test.ex>
 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 d6218632dd996475e6bf80e42f32c8ed071bbb9e..3784482121e067f67976fd65463da257e59e1888 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
        (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>
 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
 
 
 Delivered to default
 

diff --git a/test/mail/0105.firstuser b/test/mail/0105.firstuser
index 98088c7d9fe4d3d7c06f51ba751e65aa8c91077d..73c535b1eced55d6359506d21d29730a82319b6f 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
        (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>
 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
 
 
 Delivered to firstuser
 

diff --git a/test/mail/0105.seconduser b/test/mail/0105.seconduser
index 90f98df376ab4bdc39cdeb96aebf6d7669b646dc..36a2d316fe59814ab71a4869defd0cd9022ca009 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
        (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>
 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
 
 
 Delivered to seconduser
 

diff --git a/test/mail/0110.second b/test/mail/0110.second
index 3f228bef7ef614804c978644fe08e46839a17784..b9b03a45fb598e68b800f490752abe0b8d73ef4f 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
        (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>
 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 9f535da711c03fc31ca6816fe635a994dc5f0c1a..52e40075821fd5b1038561c75007e9abc694ff92 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
        (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>
 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
 
 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
        (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>
 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
 
 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
        (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>
 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
 
 X-Alias: philip
 X-Forward: userx
 

diff --git a/test/mail/0112.file b/test/mail/0112.file
index 7bc02a7a6dcce7e28b7fb2c546c59e34696204ff..73574e98d041416aabd92788fe227c2a5598ad61 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
        (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>
 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.
 
 
 Message to file.
 

diff --git a/test/mail/0112.pipe b/test/mail/0112.pipe
index 3f86bc8ae930bd4de6d0c402693eada9d155b842..70591d67c3258c09d6f3d6f8ec1e4c798a8e1fdd 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
        (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>
 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.
 
 
 Message to pipe.
 

diff --git a/test/mail/0113.second b/test/mail/0113.second
index 3f228bef7ef614804c978644fe08e46839a17784..b9b03a45fb598e68b800f490752abe0b8d73ef4f 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
        (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>
 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 a04c45d00b260c2d353ad7e112128577a4f82b78..ebd205b1be5e381045e767c2543d010e01985488 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
        (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>
 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
 
 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
 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>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test Text
 
 
 Test Text
 

diff --git a/test/mail/0114.pipe b/test/mail/0114.pipe
index 3f86bc8ae930bd4de6d0c402693eada9d155b842..70591d67c3258c09d6f3d6f8ec1e4c798a8e1fdd 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
        (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>
 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.
 
 
 Message to pipe.
 

diff --git a/test/mail/0115.file b/test/mail/0115.file
index cce7503881a965348706167b5e35da9d6f983ab0..021c3cd7a966cc6b8e70f91a4b94938ff3fe5bae 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
        (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>
 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.
 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
        (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>
 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.
 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
        (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>
 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.
 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
        (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>
 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.
 Home-Dir: 
 
 Message to three-userx.

diff --git a/test/mail/0116.acopy b/test/mail/0116.acopy
index e9c3e763eeb8bbbb24e4748c6852e1eded20e28e..a07b9fee55e4126be61c50837db439714c00bd82 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
 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>
 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.
 Added: data from copyalias
 
 Message sent to acopy.

diff --git a/test/mail/0116.alias1 b/test/mail/0116.alias1
index e9c3e763eeb8bbbb24e4748c6852e1eded20e28e..a07b9fee55e4126be61c50837db439714c00bd82 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
 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>
 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.
 Added: data from copyalias
 
 Message sent to acopy.

diff --git a/test/mail/0116.alias2 b/test/mail/0116.alias2
index e9c3e763eeb8bbbb24e4748c6852e1eded20e28e..a07b9fee55e4126be61c50837db439714c00bd82 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
 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>
 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.
 Added: data from copyalias
 
 Message sent to acopy.

diff --git a/test/mail/0116.dcopy b/test/mail/0116.dcopy
index d53ee0bea44d4806a1c0ae03e3719e77e3395b83..4899c4d2233ce35be981ea9a03139a91879cbae1 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
 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>
 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.
 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
 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>
 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.
 Added: data from copydeliver
 
 Message sent to dcopy.

diff --git a/test/mail/0118.userx b/test/mail/0118.userx
index e3b8635434aa1f6b0ce02d355d1fca703d8dc093..697244059363d2cc909697a3bfda8749f22613cf 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
        (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>
 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 364abefaddf9eb5996cb964d2ae48c55a5b2c854..28b1f31507109994256a46b4d0ce6be57739ad1e 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
        (envelope-from <CALLER@myhost.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Sender: Sender in original <sender@original.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@myhost.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.ex>

+Sender: Sender in original <sender@original.ex>

 From: CALLER_NAME <CALLER@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message.
 
 
 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
        (envelope-from <CALLER@myhost.ex>)
        id 10HmaY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Sender: Sender in original <sender@original.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaY-0005vi-00@myhost.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.ex>

+Sender: Sender in original <sender@original.ex>

 From: CALLER_NAME <CALLER@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message.
 
 
 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
        (envelope-from <CALLER@myhost.ex>)
        id 10HmaZ-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Sender: Sender in original <sender@original.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaZ-0005vi-00@myhost.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.ex>

+Sender: Sender in original <sender@original.ex>

 From: CALLER_NAME <CALLER@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message.
 
 
 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
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Sender: Sender in original <sender@original.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbA-0005vi-00@myhost.ex>
 Message-Id: <E10HmbA-0005vi-00@myhost.ex>

+Sender: Sender in original <sender@original.ex>

 From: CALLER_NAME <CALLER@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message.
 
 
 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
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbB-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Sender: Sender in original <sender@original.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbB-0005vi-00@myhost.ex>
 Message-Id: <E10HmbB-0005vi-00@myhost.ex>

+Sender: Sender in original <sender@original.ex>

 From: CALLER_NAME <CALLER@myhost.ex>
 From: CALLER_NAME <CALLER@myhost.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message.
 
 
 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
        (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>
 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.
 
 
 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
        (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>
 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.
 
 
 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
        (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>
 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.
 
 
 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
        (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>
 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.
 
 
 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
        (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>
 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.
 
 
 This is a test message.
 

diff --git a/test/mail/0131.copy b/test/mail/0131.copy
index 798a7af6e269643ddc80ebaeec0b24be4b173078..66daee4b06ece4365125f5a0f35846a28f6fa980 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
        (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>
 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
 Address-Data: >-islocal-forward-forward-local<
 
 Test message

diff --git a/test/mail/0131.userx b/test/mail/0131.userx
index 85a3958ceb740426956e8dc545c81b6a5731c726..94f4a9ba9fa162e9c022c9e4f61df74dc9560b97 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
        (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>
 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
 Address-Data: >-islocal-forward-islocal-local<
 
 Test message

diff --git a/test/mail/0133.dddd b/test/mail/0133.dddd
index 98c203b70308b133f7bbe0f821174fc1e1cebbb4..e71139135bd374ded5a5e0035fec5657d78014f1 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
 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>
 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
 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
 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>
 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
 Final: dddd@test.ex
 
 Test message

diff --git a/test/mail/0134.UC-USERX b/test/mail/0134.UC-USERX
index 78e8ca8eee1a4476ec9005b138cbc9f2565c1360..4273d8261955160fb03c9183666e9be25730d898 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
        (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>
 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
 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 4495f885dc8aa417c56c7e49aa4df71ea14f03ed..21d2c808f52040aca0aa4a115ccf61e84182b313 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
        (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>
 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: 
 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
 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>
 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: 
 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
        (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>
 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: 
 
 domain_data: 
 local_part_data: 
 

diff --git a/test/mail/0134.lc-userx b/test/mail/0134.lc-userx
index 0d8a3c837f3586a02020e0f0f00d5860eaee3470..c1c6fa19b525dbac409110d40d2d0f36e6986ebf 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
        (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>
 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: 
 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
 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>
 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
 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
        (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>
 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: 
 
 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
        (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>
 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
 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 9d74ba75ee657b7f7e42baa4e2abeb8ea4c1ec69..6df0a082ec4a0731792dd3ea7b8f1807091d97b2 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
 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
 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.
 
 
 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
 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
 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.
 
 
 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
 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
 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.
 
 
 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
 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
 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 7dd068d1071e9275b01d3addae5cf13122dea06a..7b7147c95c18a22f387be35826a6e2e325e141f3 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Transport: local_delivery
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

+Transport: local_delivery

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 First message.
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Transport: local_delivery
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>

+Transport: local_delivery

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Second message
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Transport: local_delivery_fcntl
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>

+Transport: local_delivery_fcntl

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Third message
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Transport: local_delivery_fcntl_blocking
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>

+Transport: local_delivery_fcntl_blocking

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Fourth message
 
 
 Fourth message
 

diff --git a/test/mail/0140.CALLER b/test/mail/0140.CALLER
index e7882aa43a2f100417c0633cca6d826e13d81055..468c76fc5dfb3eb5cb30b62304385ab91401f766 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
 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
 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
 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
 
 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
 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
 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.
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for reply2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: first message; non-printer >\b<
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>

+Subject: first message; non-printer >\b<

 From: CALLER_NAME <CALLER@test.ex>
 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 a7d97c7a774564b9968b52dbb46a38d0338911c3..7a937b1dc7a17ebde0e6b8ab6d11c646e5bdfc2a 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
 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
 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.
 
 
 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
 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>
 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
 
 
 Test message
 

diff --git a/test/mail/0142.filter b/test/mail/0142.filter
index 7dca98165773b9378a4f1becf979111287e006b0..3ecd4b929536402607695a9925575f67d8a8b9b1 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
 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>
 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
 
 Test message
 max fd = dddd

diff --git a/test/mail/0150.postmaster b/test/mail/0150.postmaster
index eb51b1c2f3f26e49f536ac05a244f2f1af3d37ba..a0f66f5374e7f8d78cbdc692c47dcc41561c55c1 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-From: not.the.login@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

+From: not.the.login@test.ex

 Sender: CALLER_NAME <CALLER@test.ex>
 Sender: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message
 
 
 Test message
 

diff --git a/test/mail/0151.postmaster b/test/mail/0151.postmaster
index 58f860c6d50058c45d5a622eddaceee5fd17fbc7..d3454fa19fb6b631db40ba2f645f617a839385d0 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-From: not.the.login@test.ex
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

 Date: 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

 
 Test message
 
 
 Test message
 

diff --git a/test/mail/0152.postmaster b/test/mail/0152.postmaster
index 2e23156212d6e4bd0bad7a8e28a44fbb1111e8c0..5facda3d29e64ab5caf38199d943d26c71bcfb3b 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-From: not.the.login@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

+From: not.the.login@test.ex

 Sender: CALLER_NAME <CALLER@test.ex>
 Sender: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-From: page+CALLER@test.ex
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>

 Date: 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

 
 Test message
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-From: call+CALLER@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>

+From: call+CALLER@test.ex

 Sender: CALLER_NAME <CALLER@test.ex>
 Sender: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-From: call-CALLER@test.ex
-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>

 Date: 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

 
 Test message
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-From: CALLER&page@test.ex
-Message-Id: <E10HmbB-0005vi-00@the.local.host.name>

 Date: 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

 
 Test message
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbC-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-From: CALLER&call@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>

+From: CALLER&call@test.ex

 Sender: CALLER_NAME <CALLER@test.ex>
 Sender: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbD-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-From: CALLER=call@test.ex
-Message-Id: <E10HmbD-0005vi-00@the.local.host.name>

 Date: 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

 
 Test message
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbE-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-From: page+CALLER=call@test.ex
-Message-Id: <E10HmbE-0005vi-00@the.local.host.name>

 Date: 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

 
 Test message
 
 
 Test message
 

diff --git a/test/mail/0164.CALLER b/test/mail/0164.CALLER
index 208c762729155c3080f07b6df2726aabeee2fa07..ce3f8be0957c1eabfce14c13cb7f04de265da6dd 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
 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
 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.
 
 
 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
        (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>
 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
        (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>
 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
 
 
 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
 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.
 
 
 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
 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>
 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
 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>
 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 4ede20de79480e0fcad5331feff7aa5359cb46c0..1f8c3fac7eef1c20df99907556fc5ed8c4560653 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
 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
 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.
 
 
 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
        (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>
 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
        (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>
 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
 
 
 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
 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.
 
 
 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
 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>
 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
 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>
 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 3c58c0da1c29708387c91e91504fef8a5555994a..44c5b43b795246a32c60f37049176c4462bde918 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
        (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>
 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
 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 529767368831f77932f19940ac5cd89df47a14a2..b902efb373c64e8b883bbd2e43dd55c91960ffe6 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
        (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>
 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
 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 c5ac0af4a957a0e0afa7df9412c47697492e99d4..f1d32cb835050659f989841794318edee33a9cf3 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
        (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>
 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
 
 
 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
 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
 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
 
 
 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
        (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
 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 34ff7fcd07c3346c45870e6d5bb73db0c5bdc061..6642d482e30489ef544cfadaabb1636f228d4e9a 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
        (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>
 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
 
 
 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
        (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
 quota: 0
 threshold: 10

-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message
 
 
 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
        (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%
 quota: 50M
 threshold: 41%

-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Another test
 
 
 Another test
 

diff --git a/test/mail/0171.CALLER b/test/mail/0171.CALLER
index 74a65676a70806912f5491e02079462e4e6d9006..e053d52ebf086a1d8f966db20f5978f9529c783a 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
        (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>
 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
 
 
 home: HOME=CALLER_HOME
 
 

diff --git a/test/mail/0173.userx b/test/mail/0173.userx
index e5448334c1be1b0e802c81ab13ba9d6daeb3e49c..3178cb1ffd0d58c0861fe886062d87e5a623be45 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
        (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>
 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
 
 
 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
 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>
 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
 
 
 Another test message
 

diff --git a/test/mail/0173.usery b/test/mail/0173.usery
index f7da5ec651a54c55a1b3294a7cce317b5f649331..00d5a68dc6419e1700c3f55f84ecdf36c4a1bc33 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
 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>
 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
 
 
 Another test message
 

diff --git a/test/mail/0173.userz b/test/mail/0173.userz
index f7da5ec651a54c55a1b3294a7cce317b5f649331..00d5a68dc6419e1700c3f55f84ecdf36c4a1bc33 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
 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>
 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
 
 
 Another test message
 

diff --git a/test/mail/0174.CALLER b/test/mail/0174.CALLER
index a20d75abfd43c537933b08ffc18538c4acf6818b..faaa4bcaad910c3cddac312831f7558892e38212 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
 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
 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.
 
 
 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
 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>
 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
 
 
 Yet another test message
 

diff --git a/test/mail/0174.userx b/test/mail/0174.userx
index 8ef0afb6c27cc971f63973c32bc32ec1a0a1156b..a80da164d2da6c036260e326fb92a04fdf3b3138 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
        (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>
 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
 
 
 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
 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>
 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
 
 
 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
 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>
 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
 
 
 Yet another test message
 

diff --git a/test/mail/0174.usery b/test/mail/0174.usery
index e4bfa8a1e8b1e1ed3b1969b9a32201eeb9973aa9..6f5f5b4b34bccb3cfe496d1ae6517f42d50a27b9 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
 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>
 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
 
 
 Another test message
 

diff --git a/test/mail/0174.userz b/test/mail/0174.userz
index e4bfa8a1e8b1e1ed3b1969b9a32201eeb9973aa9..6f5f5b4b34bccb3cfe496d1ae6517f42d50a27b9 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
 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>
 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
 
 
 Another test message
 

diff --git a/test/mail/0176.CALLER b/test/mail/0176.CALLER
index 0b5a235974b5922adef9f9bec8c26238af40d13f..292f12db65fc0556ce9d1d873236633fd4efaef0 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
 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
 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.
 
 
 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
        (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>
 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.
 
 
 Some message or other.
 

diff --git a/test/mail/0177.CALLER b/test/mail/0177.CALLER
index b40823a03b48cba968d9d333d5341a04b7e25c48..caba8964973f1f884d6fa6e47c95825608e1ba47 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
 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
 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.
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: fail this
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

+Subject: fail this

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a message to be failed.
 
 
 This is a message to be failed.
 

diff --git a/test/mail/0177.userx b/test/mail/0177.userx
index b1c66701f396b9a4b720f1db3cdb9a88118c9ace..fceff433efe1d4f221376f4bb4267cd4e2bab233 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbC-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: reply to this
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbC-0005vi-00@the.local.host.name>

+Subject: reply to this

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a message to be replied to.
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: freeze this (1)
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>

+Subject: freeze this (1)

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a message to be frozen.
 
 
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbE-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: freeze this (2)
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbE-0005vi-00@the.local.host.name>

+Subject: freeze this (2)

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a second message to be frozen.
 
 
 This is a second message to be frozen.
 

diff --git a/test/mail/0177.usery b/test/mail/0177.usery
index 2fc9e36ea1da832669a71146f812b2c3e81a3958..999c0a5c2cfa529e6b645aa8bb543a5ce91211b1 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
 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
 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>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 failing userx@test.ex
 
 
 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
 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
 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>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 freezing userx@test.ex
 
 
 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
 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
 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>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a text line
 
 
 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
 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
 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>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 freezing userx@test.ex
 
 
 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
 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
 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>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 freezing userz@test.ex
 
 
 freezing userz@test.ex
 

diff --git a/test/mail/0182.userx b/test/mail/0182.userx
index 3c666c667a710f241bbd0a4b3bd89d2a90ec93ae..b778e7efbc4b71ca6f0621bf3ad48a385c8209b8 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
        (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>
 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
 
 X-Added: by system filter
 X-Added: by system filter
 

diff --git a/test/mail/0189.userx b/test/mail/0189.userx
index eda035d5b5fb75a9449cb3aadbd6f633af4bfbc5..1e391afc474c3ae818c13ea942f3de59c7c4b088 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
        (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>
 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.
 
 
 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
        (envelope-from <root@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Sender: sender@some.domain
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>

+Sender: sender@some.domain

 From: CALLER_NAME <root@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....
 
 
 This is a test message from a trusted caller....
 

diff --git a/test/mail/0192.userx b/test/mail/0192.userx
index a55a9bb85eeb4a478a41a0cbeafa42a5ffd0e72f..9cf0b1bca5dd9fec848670280789eaf318429d44 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
        (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>
 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.
 
 
 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
        (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>
 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.
 
 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 0a28b3f0e7b77c19ec46c7c1e728e9dfe6a2e73a..016cbc71dc68ff8369cd023046a527f711cc7a62 100644 (file)
--- a/test/mail/0194.CALLER
+++ b/test/mail/0194.CALLER
@@ -2,6 +2,8 @@ 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
 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
 X-Failed-Recipients: userz@myhost.test.ex,
   usery@myhost.test.ex,
   userx@myhost.test.ex


@@ -9,8 +11,6 @@ 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
 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.
 
 
 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
 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>
 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.
 
 
 This is a test message.
 


@@ -45,6 +45,8 @@ 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
 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,
 X-Failed-Recipients: seven@myhost.test.ex,
   six@myhost.test.ex,
   five@myhost.test.ex,


@@ -56,8 +58,6 @@ 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
 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.
 
 
 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
 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>
 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.
 
 
 Here's another message.
 


@@ -106,6 +106,8 @@ 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
 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
 X-Failed-Recipients: userz@myhost.test.ex,
   usery@myhost.test.ex,
   userx@myhost.test.ex


@@ -113,8 +115,6 @@ 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
 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.
 
 
 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
 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

-ret: 99
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>

+ret: 99

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 More message 99
 
 
 More message 99
 

diff --git a/test/mail/0197.copies b/test/mail/0197.copies
index 49eeb21f2a629913963b55c745e6074d096fb01c..45966b188512aa5826498ecdc8973f7a638652f2 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
 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>
 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.
 .
 
 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
 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
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: doesn't@matter

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test two.
 .
 
 Test two.
 .

diff --git a/test/mail/0202.userx b/test/mail/0202.userx
index b3d6cfeaeb6e2a7bbe44004213e96c5426f1d725..68774bb98dfef7acf4b9e71ea10c8a2f7fb2cc77 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
        (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
 .: this is legal
 From: me@test.ex

-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

 Sender: CALLER_NAME <CALLER@test.ex>
 Sender: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 This line follows ..
 
 .
 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-From: me@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>

+From: me@test.ex

 Sender: CALLER_NAME <CALLER@test.ex>
 Sender: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 This line follows ..
 
 .
 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
        (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
 From: me@test.ex
 ..: this really is legal

-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>

 Sender: CALLER_NAME <CALLER@test.ex>
 Sender: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .. two dots
 .
 
 .. 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
        (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
 From: me@test.ex
 ..: this really is legal

-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>

 Sender: CALLER_NAME <CALLER@test.ex>
 Sender: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .. two dots
 .
 
 .. two dots
 .

diff --git a/test/mail/0205.redirected b/test/mail/0205.redirected
index 889ceb26d3507aa74da3d75cd9008ff9ff145db2..6b9a415ed3153b568b4b728ad9bfd06eb139a03c 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
        (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>
 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<
 
 
 Address-Data: >-redirect<
 
 

diff --git a/test/mail/0205.x b/test/mail/0205.x
index cabaaf1cbe7570d4e01688071434f4fc41dbd1cb..622cba77f607ad500f2fbcfea8fc7e82cf469da1 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
 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>
 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: ><
 
 
 Address-Data: ><
 
 

diff --git a/test/mail/0210.file b/test/mail/0210.file
index feb1225048dfd51d9de98b964c7d76dc0ed48b00..efe155e6b70f4daa15884d78c6986403c9134db4 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
 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>
 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.
 .
 
 This is a test message.
 .

diff --git a/test/mail/0210.pipe b/test/mail/0210.pipe
index 4d976d64d4f75aa11589e8d9bdc407086a127e0b..bcb24731700d312d2ec296a7a6f3ba17ed00b372 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
 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>
 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.
 .
 
 This is a test message.
 .

diff --git a/test/mail/0211.CALLER b/test/mail/0211.CALLER
index cd5f25b1a10e962f1801e7b687d3a732182457c9..29a0e32b131b733021426f7601c102814cb48f1b 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
 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
 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.
 
 
 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
        (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>
 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
 
 
 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
 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
 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.
 
 
 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
 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>
 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
 
 
 Test message 2
 

diff --git a/test/mail/0220.userx b/test/mail/0220.userx
index 0eadbaa4162868ff2121aa17993a252cf18641b4..02060801b46270397c79250874069d194de541b0 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
        (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>
 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
 
 
 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
        (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>
 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
 
 
 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
        (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>
 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
 
 
 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
        (envelope-from <foo@bar>)
        id 10HmbB-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-From: foobydooby <foo@bar>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>

+From: foobydooby <foo@bar>

 Sender: CALLER_NAME <CALLER@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
 
 
 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
        (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>
 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 b13a7d7a0266f42dc2902daed8de30ac4865b656..eed7e8eadcc50fb5414eb12ceb40cad73bd52657 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
        (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>
 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
 
 
 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
        (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>
 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
 
 
 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
        (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>
 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
 
 
 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
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbB-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-From: foobydooby <foo@bar>
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>

+From: foobydooby <foo@bar>

 Sender: CALLER_NAME <CALLER@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 6db0b20c3a53d9bd85dc69271a51597e4edf3c32..0342bd97cceba41898a67bcd65169732f7be5105 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
 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
 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>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Auto reply message
 
 
 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
 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
 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>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Auto reply message
 
 
 Auto reply message
 

diff --git a/test/mail/0222.foo2 b/test/mail/0222.foo2
index a932aa023122eb0e34e2d23d8385c9437e5226d3..e48467d989006de068a321d7910d53d146daf7f5 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
 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
 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>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Auto reply message
 
 
 Auto reply message
 

diff --git a/test/mail/0222.foo3 b/test/mail/0222.foo3
index 5747305249b3491129dc356f5d5ee64c0416cc25..99e58473fbfbccf57e5623fb481b90fb6dc05130 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
 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
 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>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Auto reply message
 
 
 Auto reply message
 

diff --git a/test/mail/0223.CALLER b/test/mail/0223.CALLER
index 45eac6bfe6c7201de5760872c701c63ea5d63873..5b42d0548308039602b0ee7b649acbb7ccdf8de4 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
 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
 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
 From: EXIMUSER@test.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test auto reply to first message
 
 
 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
 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
 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
 From: EXIMUSER@test.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test auto reply to third message
 
 
 Test auto reply to third message
 

diff --git a/test/mail/0224.CALLER b/test/mail/0224.CALLER
index a2dea13eb09ae1f323af4b1e2e556f7f92dca6a6..7ec707e8e7b9aa8b55d43e72c13fac604038a5ca 100644 (file)
--- a/test/mail/0224.CALLER
+++ b/test/mail/0224.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
 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: bounce@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
 X-Failed-Recipients: bounce@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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -30,10 +30,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 10HmaX-0005vi-00; 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 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: first message
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

+Subject: first message

 From: CALLER_NAME <CALLER@test.ex>
 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
 
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999


@@ -43,20 +43,20 @@ 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
 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
 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
 recipients after more than 0 minutes on the queue on the.local.host.name.
 
 The message identifier is:     10HmaZ-0005vi-00
 
 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
 recipients after more than 0 minutes on the queue on the.local.host.name.
 
 The message identifier is:     10HmaZ-0005vi-00

-The subject of the message is: second message

 The date of the message is:    Tue, 2 Mar 1999 09:44:33 +0000
 The date of the message is:    Tue, 2 Mar 1999 09:44:33 +0000

+The subject of the message is: second message

 
 The addresses to which the message has not yet been delivered are:
 
 
 The addresses to which the message has not yet been delivered are:
 

diff --git a/test/mail/0226.CALLER b/test/mail/0226.CALLER
index b2c29d123baf1567473472f8ffe88ebd978557cd..2b3a998fa0c41db2a3455c0b00957f9f90d2d052 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
 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
 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.
 
 
 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
 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>
 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
 
 
 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
 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
 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.
 
 
 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
 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>
 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
 
 
 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
 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>
 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
 
 
 Message 2
 

diff --git a/test/mail/0226.file b/test/mail/0226.file
index 27c3caf48e3fd294b96ab28a0ca3cf1d1637a532..79986490f16844fc33bd4a416be19808f370060d 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
 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>
 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
 
 
 Message 2
 

diff --git a/test/mail/0231.a b/test/mail/0231.a
index e83069fae614000e3239d8a76ec73b5bd7fd3081..aef74170114f7346c3cc945266c0a769f2f61956 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
 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
 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>
 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 ef29f5fea1de2ac4872e99a1911bea198eb65bc0..02e9daa6e6d3233c69d62b0e42784e666685af16 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
 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
 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>
 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 1e9b1086cbf7983ff901806d67ef4cc826adebb4..edd32e88685eced897e51e48744ee02dd632650f 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
 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
 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.
 
 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
 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
 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>.
 
 Message 10HmbB-0005vi-00 was frozen on arrival by ACL.
 The sender is <CALLER@myhost.test.ex>.


@@ -34,12 +34,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 me@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmbE-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: <E10HmbE-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
 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: <E10HmbE-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message 10HmbD-0005vi-00 was frozen on arrival by ACL.
 The sender is <CALLER@myhost.test.ex>.
 
 Message 10HmbD-0005vi-00 was frozen on arrival by ACL.
 The sender is <CALLER@myhost.test.ex>.

diff --git a/test/mail/0233.postmaster b/test/mail/0233.postmaster
index 6c0b1ff4e5ece3b77be2340ddd2cfd324f682adc..84146dc36a964a99bbfa19968a29b1177b1d6def 100644 (file)
--- a/test/mail/0233.postmaster
+++ b/test/mail/0233.postmaster
@@ -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 postmaster@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for postmaster@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: postmaster@myhost.test.ex
 Subject: System filter has frozen
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
 References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 To: postmaster@myhost.test.ex
 Subject: System filter has frozen
 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0237.CALLER b/test/mail/0237.CALLER
index 700c73d7bdabdcbbb7f1ecf4d435e16fd7d6134e..43cd1150bc69bd59ceb63904fa8e09836d2945b5 100644 (file)
--- a/test/mail/0237.CALLER
+++ b/test/mail/0237.CALLER
@@ -2,12 +2,12 @@ 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
 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: Mail delivery failed: returning message to sender
 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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -25,9 +25,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
 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>
 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
 
 
 Message 1
 


@@ -35,12 +35,12 @@ 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
 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: Mail delivery failed: returning message to sender
 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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -85,9 +85,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
 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>
 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
 
 
 Message 2
 


@@ -99,9 +99,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
 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>
 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
 
 
 Message 2
 

diff --git a/test/mail/0237.file b/test/mail/0237.file
index 27c3caf48e3fd294b96ab28a0ca3cf1d1637a532..79986490f16844fc33bd4a416be19808f370060d 100644 (file)
--- a/test/mail/0237.file
+++ b/test/mail/0237.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
 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>
 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
 
 
 Message 2
 

diff --git a/test/mail/0240.subdir/userx b/test/mail/0240.subdir/userx
index e3b8635434aa1f6b0ce02d355d1fca703d8dc093..697244059363d2cc909697a3bfda8749f22613cf 100644 (file)
--- a/test/mail/0240.subdir/userx
+++ b/test/mail/0240.subdir/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
        (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>
 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/0241.userx b/test/mail/0241.userx
index e3b8635434aa1f6b0ce02d355d1fca703d8dc093..697244059363d2cc909697a3bfda8749f22613cf 100644 (file)
--- a/test/mail/0241.userx
+++ b/test/mail/0241.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
        (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>
 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/0243.CALLER b/test/mail/0243.CALLER
index 11fc70884a4054589b6896ff79b7042a48d21ea3..1131d9c33c3db108e2e9957de9bdd635017602b6 100644 (file)
--- a/test/mail/0243.CALLER
+++ b/test/mail/0243.CALLER
@@ -2,6 +2,8 @@ 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@nl.demon.net; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for CALLER@nl.demon.net; 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: local.part@some.domain
 Reply-To: x@y, 
  p@q
 From: local.part@some.domain
 Reply-To: x@y, 
  p@q


@@ -10,8 +12,6 @@ Subject: Re:
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
 References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 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>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Text of auto message. Expanded local_part is: faq.
 
 
 Text of auto message. Expanded local_part is: faq.
 

diff --git a/test/mail/0246.CALLER b/test/mail/0246.CALLER
index 8f9e5141b8ebe8a93b81611fc1ccd7f3482fe1a7..2de9eaf2f12309067bcc0c8e873dcb81ddd14ac2 100644 (file)
--- a/test/mail/0246.CALLER
+++ b/test/mail/0246.CALLER
@@ -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 CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER 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_NAME <CALLER@myhost.test.ex>
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
 References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 To: CALLER_NAME <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: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 >>>>>>>>>>>>>>
 ${if exists{/source/exim4/AutoTest/aux/284.data}{${lookup{1}lsearch{/source/exim4/AutoTest/aux/284.data}{$value}{NOT FOUND}}}{NOT EXISTS}} 
 
 >>>>>>>>>>>>>>
 ${if exists{/source/exim4/AutoTest/aux/284.data}{${lookup{1}lsearch{/source/exim4/AutoTest/aux/284.data}{$value}{NOT FOUND}}}{NOT EXISTS}} 

diff --git a/test/mail/0252.t1 b/test/mail/0252.t1
index c81584d8b8d0c687950e255a65d5663924c0abf1..e778583c4e4014de9222a357f46309b40996587f 100644 (file)
--- a/test/mail/0252.t1
+++ b/test/mail/0252.t1
@@ -4,9 +4,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <abc@x.y.z>)
        id 10HmaX-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <abc@x.y.z>)
        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: abc@x.y.z
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: abc@x.y.z

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message
 
 
 Test message
 


@@ -16,9 +16,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <pqr@x.y.z>)
        id 10HmaY-0005vi-00
        for alias@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <pqr@x.y.z>)
        id 10HmaY-0005vi-00
        for alias@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: pqr@x.y.z
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: pqr@x.y.z

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message
 
 
 Test message
 


@@ -28,9 +28,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <gfh@x.y.z>)
        id 10HmaZ-0005vi-00
        for forward@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <gfh@x.y.z>)
        id 10HmaZ-0005vi-00
        for forward@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: gfh@x.y.z
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: gfh@x.y.z

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message
 
 
 Test message
 


@@ -40,9 +40,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <mno@x.y.z>)
        id 10HmbA-0005vi-00
        for smart@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <mno@x.y.z>)
        id 10HmbA-0005vi-00
        for smart@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>
 From: mno@x.y.z
 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 From: mno@x.y.z

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message
 
 
 Test message
 

diff --git a/test/mail/0252.t2 b/test/mail/0252.t2
index 557cf27805bb2f52cc1855135e1a010baa44cb86..519380d2a85a3a0bf5555a1db6e9d47b6aa6071a 100644 (file)
--- a/test/mail/0252.t2
+++ b/test/mail/0252.t2
@@ -4,9 +4,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <abc@x.y.z>)
        id 10HmaX-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <abc@x.y.z>)
        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: abc@x.y.z
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: abc@x.y.z

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message
 
 
 Test message
 


@@ -16,9 +16,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <pqr@x.y.z>)
        id 10HmaY-0005vi-00
        for alias@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <pqr@x.y.z>)
        id 10HmaY-0005vi-00
        for alias@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: pqr@x.y.z
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: pqr@x.y.z

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message
 
 
 Test message
 


@@ -28,9 +28,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <gfh@x.y.z>)
        id 10HmaZ-0005vi-00
        for forward@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <gfh@x.y.z>)
        id 10HmaZ-0005vi-00
        for forward@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: gfh@x.y.z
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: gfh@x.y.z

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message
 
 
 Test message
 


@@ -40,9 +40,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <mno@x.y.z>)
        id 10HmbA-0005vi-00
        for smart@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <mno@x.y.z>)
        id 10HmbA-0005vi-00
        for smart@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>
 From: mno@x.y.z
 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 From: mno@x.y.z

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message
 
 
 Test message
 

diff --git a/test/mail/0253.lmn b/test/mail/0253.lmn
index eeac8dc204be4f8917eaf6f1e12d11873ac872a5..9b6ee4e69996c58aaa814fe8357e002c23da7ad3 100644 (file)
--- a/test/mail/0253.lmn
+++ b/test/mail/0253.lmn
@@ -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 10HmbA-0005vi-00
        for lmn@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmbA-0005vi-00
        for lmn@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: fail@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: lmn@myhost.test.ex
 Subject: Mail delivery failed
 X-Failed-Recipients: fail@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: lmn@myhost.test.ex
 Subject: Mail delivery failed

-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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -29,9 +29,9 @@ Return-path: <pqr@x.y.z>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <pqr@x.y.z>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <pqr@x.y.z>)
        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: pqr@x.y.z
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: pqr@x.y.z

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message 3
 
 
 Test message 3
 

diff --git a/test/mail/0253.t1 b/test/mail/0253.t1
index 89e645ffb08e529e518f2811cc8b3766bb2b0d74..11d017e13ba9d3fe339bfabd0c27a3a48297f254 100644 (file)
--- a/test/mail/0253.t1
+++ b/test/mail/0253.t1
@@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <abc@x.y.z>)
        id 10HmaX-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <abc@x.y.z>)
        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: abc@x.y.z
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: abc@x.y.z

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message
 .
 
 Test message
 .

diff --git a/test/mail/0253.t2 b/test/mail/0253.t2
index 7a64b8ccf0a57a2057f9451557e83dd1a713041a..b30c72c8d46ed922bfcd0fbcf4464d70bf5c72e0 100644 (file)
--- a/test/mail/0253.t2
+++ b/test/mail/0253.t2
@@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <xyz@x.y.z>)
        id 10HmaY-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <xyz@x.y.z>)
        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: xyz@x.y.z
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: xyz@x.y.z

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message 2
 .
 
 Test message 2
 .

diff --git a/test/mail/0256.CALLER b/test/mail/0256.CALLER
index 87ed8a038db5bef9707273b7e2e96c79ae8cd9f6..434e191e665e824b237a961a63e3d4649de03632 100644 (file)
--- a/test/mail/0256.CALLER
+++ b/test/mail/0256.CALLER
@@ -1,13 +1,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; Tue, 2 Mar 1999 09:44:33 +0000
 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; 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: unknown@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
 X-Failed-Recipients: unknown@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@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -24,8 +24,8 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0256.abc@def b/test/mail/0256.abc@def
index 22a2ecd35529ac80bafdda942147081fb659080a..5ef0a58b1de1e31a8c4a7520cd3544a6a7933ca3 100644 (file)
--- a/test/mail/0256.abc@def
+++ b/test/mail/0256.abc@def
@@ -1,13 +1,13 @@
 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; Tue, 2 Mar 1999 09:44:33 +0000
 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; 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: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: "abc@def"@unknown.domain
 Subject: Mail delivery failed: returning message to sender
 X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: "abc@def"@unknown.domain
 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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -24,8 +24,8 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <"abc@def"@unknown.domain>)
        id 10HmaZ-0005vi-00
        for unknown@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <"abc@def"@unknown.domain>)
        id 10HmaZ-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: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: "abc@def"@unknown.domain
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: "abc@def"@unknown.domain

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0256.abcd+test.ex+xxxx b/test/mail/0256.abcd+test.ex+xxxx
index 87ed8a038db5bef9707273b7e2e96c79ae8cd9f6..434e191e665e824b237a961a63e3d4649de03632 100644 (file)
--- a/test/mail/0256.abcd+test.ex+xxxx
+++ b/test/mail/0256.abcd+test.ex+xxxx
@@ -1,13 +1,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; Tue, 2 Mar 1999 09:44:33 +0000
 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; 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: unknown@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
 X-Failed-Recipients: unknown@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@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -24,8 +24,8 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0256.abcd+unknown.domain+"abc@def" b/test/mail/0256.abcd+unknown.domain+"abc@def"
index 22a2ecd35529ac80bafdda942147081fb659080a..5ef0a58b1de1e31a8c4a7520cd3544a6a7933ca3 100644 (file)
--- a/test/mail/0256.abcd+unknown.domain+"abc@def"
+++ b/test/mail/0256.abcd+unknown.domain+"abc@def"
@@ -1,13 +1,13 @@
 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; Tue, 2 Mar 1999 09:44:33 +0000
 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; 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: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: "abc@def"@unknown.domain
 Subject: Mail delivery failed: returning message to sender
 X-Failed-Recipients: unknown@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: "abc@def"@unknown.domain
 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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -24,8 +24,8 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <"abc@def"@unknown.domain>)
        id 10HmaZ-0005vi-00
        for unknown@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <"abc@def"@unknown.domain>)
        id 10HmaZ-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: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: "abc@def"@unknown.domain
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: "abc@def"@unknown.domain

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0258.userx b/test/mail/0258.userx
index 75ac314779641172f64d714d735f69b4416fab18..5abfe11b77769d4866db3dc802285700dda12e0f 100644 (file)
--- a/test/mail/0258.userx
+++ b/test/mail/0258.userx
@@ -3,12 +3,12 @@ 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
        (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>

 crheader: includes <
  > and ends CRLF
 Subject: this is still a header
 crheader: includes <
  > and ends CRLF
 Subject: this is still a header

-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Text includes <
 > and ends CRLF
 
 Text includes <
 > and ends CRLF


@@ -23,11 +23,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
        (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>

 crheader: includes <
  > and ends CRLF
 crheader: includes <
  > and ends CRLF

-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Text includes <
 > and ends CRLF
 
 Text includes <
 > and ends CRLF


@@ -43,11 +43,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
        (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>

 crheader: includes <
  > and ends CRLF
 crheader: includes <
  > and ends CRLF

-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Text includes <
 > and ends CRLF
 
 Text includes <
 > and ends CRLF


@@ -62,9 +62,9 @@ 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
        (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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message with no
 terminating LF
 
 Message with no
 terminating LF


@@ -74,9 +74,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
        (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: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message with terminating CR
 
 
 Message with terminating CR
 


@@ -85,9 +85,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbC-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message with no
 terminating LF
 
 Message with no
 terminating LF


@@ -97,9 +97,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
        (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>
 Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message with terminating CR
 
 
 Message with terminating CR
 


@@ -108,12 +108,12 @@ 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
        (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>

 .dotheader: header line starts with a dot
 xxx: dot bare CR:.
  xyz
 .dotheader: header line starts with a dot
 xxx: dot bare CR:.
  xyz

-Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
  weird header line
 
 .
  weird header line


@@ -124,11 +124,11 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbF-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.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@myhost.test.ex>

 Subject: contains CR<
  > in the subject
 Subject: contains CR<
  > in the subject

-Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 CR.CR
 .
 
 CR.CR
 .


@@ -140,11 +140,11 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbG-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.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@myhost.test.ex>

 Subject: contains CR<
  > in the subject
 Subject: contains CR<
  > in the subject

-Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 CR.CR
 .
 
 CR.CR
 .

diff --git a/test/mail/0260.userx b/test/mail/0260.userx
index c620db5d71deef265f94c40001be43a412c2aa7e..68c6bc139324bee771842e34d598fc18ec34e292 100644 (file)
--- a/test/mail/0260.userx
+++ b/test/mail/0260.userx
@@ -2,8 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0266.CALLER b/test/mail/0266.CALLER
index 9fd70e00a1ac133220aad04d9d0d4327465e5f81..d09def199688cea08e1285100440ca9339732bb3 100644 (file)
--- a/test/mail/0266.CALLER
+++ b/test/mail/0266.CALLER
@@ -4,13 +4,13 @@ Envelope-to: CALLER@test.ex
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmbF-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex 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@myhost.test.ex>

 X-Failed-Recipients: nmlist@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
 X-Failed-Recipients: nmlist@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@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -26,9 +26,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbD-0005vi-00
        for nmlist@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbD-0005vi-00
        for nmlist@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@test.ex>
 Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message to nmlist.
 
 
 Message to nmlist.
 

diff --git a/test/mail/0266.filter b/test/mail/0266.filter
index 137fab1f660bc91cfee477cb72ff6f61b842c2b0..30dbcb4cc8c5a89ff3d0031d930852fc22ea02af 100644 (file)
--- a/test/mail/0266.filter
+++ b/test/mail/0266.filter
@@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
        for filter@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
        for filter@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: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0266.filter2 b/test/mail/0266.filter2
index 443ca18c3a8f695320d5632d995cedb4a9513fa9..da3371030e5286c31c37f2ae9291f7f33e15f06c 100644 (file)
--- a/test/mail/0266.filter2
+++ b/test/mail/0266.filter2
@@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbG-0005vi-00
        for filter2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbG-0005vi-00
        for filter2@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>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message to filter2.
 
 
 Message to filter2.
 

diff --git a/test/mail/0266.filter3 b/test/mail/0266.filter3
index 62ddce124f89c4ed10af1993123c1c18148957ef..14d861e66c2808228ed9473d2f99d9807650bd40 100644 (file)
--- a/test/mail/0266.filter3
+++ b/test/mail/0266.filter3
@@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbI-0005vi-00
        for filter3@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbI-0005vi-00
        for filter3@test.ex; 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>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message to filter3.
 
 
 Message to filter3.
 

diff --git a/test/mail/0266.list2 b/test/mail/0266.list2
index 7b7dd143175798bf1ea2f77bb47e3ef1bf62d6a4..74d7062872729ce804a9b9411c21e55d912d60a0 100644 (file)
--- a/test/mail/0266.list2
+++ b/test/mail/0266.list2
@@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for list2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for list2@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@test.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message to list2.
 
 
 Message to list2.
 

diff --git a/test/mail/0266.postmaster b/test/mail/0266.postmaster
index 7a17cf16e14333f95950a4df5869724efbcc128c..bf47c0fedba86a99a7d11a3d558725e4d71e5992 100644 (file)
--- a/test/mail/0266.postmaster
+++ b/test/mail/0266.postmaster
@@ -4,12 +4,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from root by myhost.test.ex with local (Exim x.yz)
        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@myhost.test.ex>

 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering

-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 The r1 router encountered the following error(s):
 
 
 The r1 router encountered the following error(s):
 


@@ -24,12 +24,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
        id 10HmbA-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from root by myhost.test.ex with local (Exim x.yz)
        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@myhost.test.ex>

 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering

-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 The r1 router encountered the following error(s):
 
 
 The r1 router encountered the following error(s):
 


@@ -44,12 +44,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
        id 10HmbC-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from root by myhost.test.ex with local (Exim x.yz)
        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@myhost.test.ex>

 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering

-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 There's an error in your filter file.
 The file has been ignored.
 
 There's an error in your filter file.
 The file has been ignored.


@@ -66,12 +66,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
        id 10HmbE-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from root by myhost.test.ex with local (Exim x.yz)
        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@myhost.test.ex>

 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering

-Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 The r1a router encountered the following error(s):
 
 
 The r1a router encountered the following error(s):
 


@@ -86,12 +86,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
        id 10HmbH-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from root by myhost.test.ex with local (Exim x.yz)
        id 10HmbH-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: <E10HmbH-0005vi-00@myhost.test.ex>

 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering

-Message-Id: <E10HmbH-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 There's an error in your filter file.
 The file has been ignored.
 
 There's an error in your filter file.
 The file has been ignored.


@@ -108,12 +108,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
        id 10HmbJ-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from root by myhost.test.ex with local (Exim x.yz)
        id 10HmbJ-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: <E10HmbJ-0005vi-00@myhost.test.ex>

 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering

-Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 There's an error in your filter file.
 The file has been ignored.
 
 There's an error in your filter file.
 The file has been ignored.

diff --git a/test/mail/0266.spqr b/test/mail/0266.spqr
index 6c1c436e7e293a714859b6300a4555d72cef2c52..52a775366fc17d503e1285e2a8da9802fd77a8f6 100644 (file)
--- a/test/mail/0266.spqr
+++ b/test/mail/0266.spqr
@@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for list@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for list@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@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0266.userx b/test/mail/0266.userx
index 6c1c436e7e293a714859b6300a4555d72cef2c52..52a775366fc17d503e1285e2a8da9802fd77a8f6 100644 (file)
--- a/test/mail/0266.userx
+++ b/test/mail/0266.userx
@@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for list@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for list@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@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0270.CALLER b/test/mail/0270.CALLER
index 9fd70e00a1ac133220aad04d9d0d4327465e5f81..d09def199688cea08e1285100440ca9339732bb3 100644 (file)
--- a/test/mail/0270.CALLER
+++ b/test/mail/0270.CALLER
@@ -4,13 +4,13 @@ Envelope-to: CALLER@test.ex
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmbF-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex 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@myhost.test.ex>

 X-Failed-Recipients: nmlist@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
 X-Failed-Recipients: nmlist@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@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -26,9 +26,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbD-0005vi-00
        for nmlist@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbD-0005vi-00
        for nmlist@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@test.ex>
 Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message to nmlist.
 
 
 Message to nmlist.
 

diff --git a/test/mail/0270.filter b/test/mail/0270.filter
index 137fab1f660bc91cfee477cb72ff6f61b842c2b0..30dbcb4cc8c5a89ff3d0031d930852fc22ea02af 100644 (file)
--- a/test/mail/0270.filter
+++ b/test/mail/0270.filter
@@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
        for filter@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
        for filter@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: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0270.filter2 b/test/mail/0270.filter2
index 443ca18c3a8f695320d5632d995cedb4a9513fa9..da3371030e5286c31c37f2ae9291f7f33e15f06c 100644 (file)
--- a/test/mail/0270.filter2
+++ b/test/mail/0270.filter2
@@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbG-0005vi-00
        for filter2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbG-0005vi-00
        for filter2@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>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message to filter2.
 
 
 Message to filter2.
 

diff --git a/test/mail/0270.filter3 b/test/mail/0270.filter3
index 62ddce124f89c4ed10af1993123c1c18148957ef..14d861e66c2808228ed9473d2f99d9807650bd40 100644 (file)
--- a/test/mail/0270.filter3
+++ b/test/mail/0270.filter3
@@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbI-0005vi-00
        for filter3@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbI-0005vi-00
        for filter3@test.ex; 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>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message to filter3.
 
 
 Message to filter3.
 

diff --git a/test/mail/0270.list2 b/test/mail/0270.list2
index 7b7dd143175798bf1ea2f77bb47e3ef1bf62d6a4..74d7062872729ce804a9b9411c21e55d912d60a0 100644 (file)
--- a/test/mail/0270.list2
+++ b/test/mail/0270.list2
@@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for list2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for list2@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@test.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message to list2.
 
 
 Message to list2.
 

diff --git a/test/mail/0270.postmaster b/test/mail/0270.postmaster
index 3a6d439230e8bb72437da5a665250ed87288c46b..949c2815b1eb9b6e7f2dec5ce1a8417537356df3 100644 (file)
--- a/test/mail/0270.postmaster
+++ b/test/mail/0270.postmaster
@@ -4,12 +4,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
        id 10HmaY-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from root by myhost.test.ex with local (Exim x.yz)
        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@myhost.test.ex>

 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering

-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 The r1 router encountered the following error(s):
 
 
 The r1 router encountered the following error(s):
 


@@ -24,12 +24,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
        id 10HmbA-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from root by myhost.test.ex with local (Exim x.yz)
        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@myhost.test.ex>

 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering

-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 The r1 router encountered the following error(s):
 
 
 The r1 router encountered the following error(s):
 


@@ -44,12 +44,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
        id 10HmbC-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from root by myhost.test.ex with local (Exim x.yz)
        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@myhost.test.ex>

 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering

-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 There's an error in your filter file.
 The file has been ignored.
 
 There's an error in your filter file.
 The file has been ignored.


@@ -66,12 +66,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
        id 10HmbE-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from root by myhost.test.ex with local (Exim x.yz)
        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@myhost.test.ex>

 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering

-Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 The r1a router encountered the following error(s):
 
 
 The r1a router encountered the following error(s):
 


@@ -86,12 +86,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
        id 10HmbH-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from root by myhost.test.ex with local (Exim x.yz)
        id 10HmbH-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: <E10HmbH-0005vi-00@myhost.test.ex>

 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering

-Message-Id: <E10HmbH-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 There's an error in your filter file.
 The file has been ignored.
 
 There's an error in your filter file.
 The file has been ignored.


@@ -108,12 +108,12 @@ Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
        id 10HmbJ-0005vi-00
        for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from root by myhost.test.ex with local (Exim x.yz)
        id 10HmbJ-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: <E10HmbJ-0005vi-00@myhost.test.ex>

 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering

-Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 There's an error in your filter file.
 The file has been ignored.
 
 There's an error in your filter file.
 The file has been ignored.

diff --git a/test/mail/0270.spqr b/test/mail/0270.spqr
index 6c1c436e7e293a714859b6300a4555d72cef2c52..52a775366fc17d503e1285e2a8da9802fd77a8f6 100644 (file)
--- a/test/mail/0270.spqr
+++ b/test/mail/0270.spqr
@@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for list@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for list@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@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0270.userx b/test/mail/0270.userx
index 6c1c436e7e293a714859b6300a4555d72cef2c52..52a775366fc17d503e1285e2a8da9802fd77a8f6 100644 (file)
--- a/test/mail/0270.userx
+++ b/test/mail/0270.userx
@@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for list@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for list@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@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0274.abcd b/test/mail/0274.abcd
index c620db5d71deef265f94c40001be43a412c2aa7e..68c6bc139324bee771842e34d598fc18ec34e292 100644 (file)
--- a/test/mail/0274.abcd
+++ b/test/mail/0274.abcd
@@ -2,8 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0274.redirect b/test/mail/0274.redirect
index c620db5d71deef265f94c40001be43a412c2aa7e..68c6bc139324bee771842e34d598fc18ec34e292 100644 (file)
--- a/test/mail/0274.redirect
+++ b/test/mail/0274.redirect
@@ -2,8 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0274.userx b/test/mail/0274.userx
index c620db5d71deef265f94c40001be43a412c2aa7e..68c6bc139324bee771842e34d598fc18ec34e292 100644 (file)
--- a/test/mail/0274.userx
+++ b/test/mail/0274.userx
@@ -2,8 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0274.xyz b/test/mail/0274.xyz
index c620db5d71deef265f94c40001be43a412c2aa7e..68c6bc139324bee771842e34d598fc18ec34e292 100644 (file)
--- a/test/mail/0274.xyz
+++ b/test/mail/0274.xyz
@@ -2,8 +2,8 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0280.CALLER b/test/mail/0280.CALLER
index 76002d9716d12b5cb0986479118cc96fd6b13776..eb2858159086906ddcf3d398d854253c149665be 100644 (file)
--- a/test/mail/0280.CALLER
+++ b/test/mail/0280.CALLER
@@ -1,13 +1,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; Tue, 2 Mar 1999 09:44:33 +0000
 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; 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: spqr@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: spqr@test.ex
 Subject: Mail delivery failed: returning message to sender
 X-Failed-Recipients: spqr@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: spqr@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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -24,21 +24,21 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <spqr@test.ex>)
        id 10HmaX-0005vi-00
        for spqr@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <spqr@test.ex>)
        id 10HmaX-0005vi-00
        for spqr@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: spqr@test.ex
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: spqr@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 myhost.test.ex with local (Exim x.yz)
        id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 
 
 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; 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: abcd@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: abcd@test.ex
 Subject: Mail delivery failed: returning message to sender
 X-Failed-Recipients: abcd@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: abcd@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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -55,8 +55,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <abcd@test.ex>)
        id 10HmaZ-0005vi-00
        for abcd@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <abcd@test.ex>)
        id 10HmaZ-0005vi-00
        for abcd@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: abcd@test.ex
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: abcd@test.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0283.CALLER b/test/mail/0283.CALLER
index 282f7c14372ed4731b14684b530e59fd228c50ce..4ed2331cd93723e0b3409f584692d2662dd5f22e 100644 (file)
--- a/test/mail/0283.CALLER
+++ b/test/mail/0283.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 10HmaZ-0005vi-00
        for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmaZ-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: <E10HmaZ-0005vi-00@myhost.test.ex>

 X-Failed-Recipients: somebody@myhost.test.ex
 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
 X-Failed-Recipients: somebody@myhost.test.ex
 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: <E10HmaZ-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -30,9 +30,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for somebody@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for somebody@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>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 test
 
 
 test
 

diff --git a/test/mail/0284.batched b/test/mail/0284.batched
index 51d20fbb5f3f4c10280b4fb0caf5a63292af7959..249f6556907aafc1c58a205b56c4c01e56b06cfb 100644 (file)
--- a/test/mail/0284.batched
+++ b/test/mail/0284.batched
@@ -4,9 +4,9 @@ Envelope-to: x-t1@test.ex,
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 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
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999


@@ -15,9 +15,9 @@ Envelope-to: x-t4@test.ex,
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 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
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999


@@ -26,8 +26,8 @@ Envelope-to: y-t4@test.ex,
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0284.other.domain b/test/mail/0284.other.domain
index 0d5a6749500ef3ff252716877d28cfeb83eb030e..47818fe9b4d8a68236199f04d719b84e626f7b5d 100644 (file)
--- a/test/mail/0284.other.domain
+++ b/test/mail/0284.other.domain
@@ -3,8 +3,8 @@ Envelope-to: z-t3@other.domain
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0284.test.ex b/test/mail/0284.test.ex
index c0c5be90bffada6037d316f76cefb2995b8e0c73..c537eea90807f9e8b152a68a4ceefbd432d898ca 100644 (file)
--- a/test/mail/0284.test.ex
+++ b/test/mail/0284.test.ex
@@ -4,8 +4,8 @@ Envelope-to: x-t3@test.ex,
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0284.x-t2 b/test/mail/0284.x-t2
index 685deb48ace6a4fb0a9aa42e7ca021997b423e9a..1f740be46a8e2fc9041fd2d9baa3dff42b9fec30 100644 (file)
--- a/test/mail/0284.x-t2
+++ b/test/mail/0284.x-t2
@@ -3,8 +3,8 @@ Envelope-to: x-t2@test.ex
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0284.y-t2 b/test/mail/0284.y-t2
index a2c4531e580dfccbac2739d220bfe4b2c44955de..c0b14e8fb12155cfa185ddade98939e399e3bbbc 100644 (file)
--- a/test/mail/0284.y-t2
+++ b/test/mail/0284.y-t2
@@ -3,8 +3,8 @@ Envelope-to: y-t2@test.ex
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0289.CALLER b/test/mail/0289.CALLER
index 67685017d8e7938e76dc8459360bceea6a8b10e3..b671a34df9c6831aa952cccc633ad7dda5a7aa0c 100644 (file)
--- a/test/mail/0289.CALLER
+++ b/test/mail/0289.CALLER
@@ -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 10HmaX-0005vi-00
        for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmaX-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: <E10HmaX-0005vi-00@myhost.test.ex>

 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail failure - too many recipients
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
 Subject: Mail failure - too many recipients

-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 A message that you sent contained more recipients than allowed on this
 system. It was not delivered to any recipients.
 
 A message that you sent contained more recipients than allowed on this
 system. It was not delivered to any recipients.

diff --git a/test/mail/0296.CALLER b/test/mail/0296.CALLER
index e9740521154f5c7bdb1ea2cf07efd62fb00e98ae..861ec80fc1b89b3fad5809b9e9525202551002cd 100644 (file)
--- a/test/mail/0296.CALLER
+++ b/test/mail/0296.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
 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: failure@myhost.test.ex
 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
 X-Failed-Recipients: failure@myhost.test.ex
 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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -25,9 +25,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for failure@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for failure@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>
 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 junk data
 
 
 Test junk data
 

diff --git a/test/mail/0298.CALLER b/test/mail/0298.CALLER
index 8cb3b64545d63f1af415d01b030b951515ceb9ba..9f0e99775363fb1309fcf93988753994b6d90a9c 100644 (file)
--- a/test/mail/0298.CALLER
+++ b/test/mail/0298.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
 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: failure1@myhost.test.ex
 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
 X-Failed-Recipients: failure1@myhost.test.ex
 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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -26,22 +26,22 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for failure1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for failure1@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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.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 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
 
 
 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: failure2@myhost.test.ex
 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
 X-Failed-Recipients: failure2@myhost.test.ex
 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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -58,8 +58,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for failure2@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for failure2@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>
 Message-Id: <E10HmaZ-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/0306.anyone b/test/mail/0306.anyone
index 2c8eb725123f24f865b4e1f54e5fa140c0919edf..5c5c574e7725821baa3ca1153be5b74110d8fb42 100644 (file)
--- a/test/mail/0306.anyone
+++ b/test/mail/0306.anyone
@@ -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 10HmbA-0005vi-00
        for anyone@anywhere; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmbA-0005vi-00
        for anyone@anywhere; 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: list1@lists.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: anyone@anywhere
 Subject: Mail delivery failed: returning message to sender
 X-Failed-Recipients: list1@lists.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: anyone@anywhere
 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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -25,22 +25,22 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <anyone@anywhere>)
        id 10HmaZ-0005vi-00
        for list1@lists.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <anyone@anywhere>)
        id 10HmaZ-0005vi-00
        for list1@lists.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: anyone@anywhere
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: anyone@anywhere

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 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 anyone@anywhere; Tue, 2 Mar 1999 09:44:33 +0000
 
 
 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 anyone@anywhere; 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>

 X-Failed-Recipients: nonlist@lists.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: anyone@anywhere
 Subject: Mail delivery failed: returning message to sender
 X-Failed-Recipients: nonlist@lists.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: anyone@anywhere
 Subject: Mail delivery failed: returning message to sender

-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -57,8 +57,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <anyone@anywhere>)
        id 10HmbB-0005vi-00
        for nonlist@lists.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <anyone@anywhere>)
        id 10HmbB-0005vi-00
        for nonlist@lists.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: anyone@anywhere
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: anyone@anywhere

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0307.anyone b/test/mail/0307.anyone
index 2c8eb725123f24f865b4e1f54e5fa140c0919edf..5c5c574e7725821baa3ca1153be5b74110d8fb42 100644 (file)
--- a/test/mail/0307.anyone
+++ b/test/mail/0307.anyone
@@ -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 10HmbA-0005vi-00
        for anyone@anywhere; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmbA-0005vi-00
        for anyone@anywhere; 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: list1@lists.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: anyone@anywhere
 Subject: Mail delivery failed: returning message to sender
 X-Failed-Recipients: list1@lists.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: anyone@anywhere
 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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -25,22 +25,22 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <anyone@anywhere>)
        id 10HmaZ-0005vi-00
        for list1@lists.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <anyone@anywhere>)
        id 10HmaZ-0005vi-00
        for list1@lists.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: anyone@anywhere
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: anyone@anywhere

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 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 anyone@anywhere; Tue, 2 Mar 1999 09:44:33 +0000
 
 
 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 anyone@anywhere; 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>

 X-Failed-Recipients: nonlist@lists.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: anyone@anywhere
 Subject: Mail delivery failed: returning message to sender
 X-Failed-Recipients: nonlist@lists.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: anyone@anywhere
 Subject: Mail delivery failed: returning message to sender

-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -57,8 +57,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <anyone@anywhere>)
        id 10HmbB-0005vi-00
        for nonlist@lists.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <anyone@anywhere>)
        id 10HmbB-0005vi-00
        for nonlist@lists.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: anyone@anywhere
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: anyone@anywhere

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0309.CALLER b/test/mail/0309.CALLER
index 59aae6e4e63651101163a049c7c13fdd946c773c..f5ae66a5fd028cfcd3e92db2c4d34256dfb00d4a 100644 (file)
--- a/test/mail/0309.CALLER
+++ b/test/mail/0309.CALLER
@@ -2,6 +2,8 @@ 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
 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: 1k@myhost.test.ex,
   55@myhost.test.ex,
   50@myhost.test.ex
 X-Failed-Recipients: 1k@myhost.test.ex,
   55@myhost.test.ex,
   50@myhost.test.ex


@@ -9,8 +11,6 @@ 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
 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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -27,9 +27,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
 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>
 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. This is a test message.
 This is a test message. This is a test message.
 
 This is a test message. This is a test message.
 This is a test message. This is a test message.

diff --git a/test/mail/0310.CALLER b/test/mail/0310.CALLER
index 55748724a39535ae9810924cdea9364d9f05d9e6..b6167a06f292ce911dedd0ac8caed1e4898c0e6d 100644 (file)
--- a/test/mail/0310.CALLER
+++ b/test/mail/0310.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
 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: abcd@myhost.test.ex
 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
 X-Failed-Recipients: abcd@myhost.test.ex
 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.
 
 
 This message was created automatically by mail delivery software.
 

diff --git a/test/mail/0318.userx b/test/mail/0318.userx
index 6f77ef9ee77f498e110fb714eb9de463d5290a40..21ba6107ba0920b44fc450696ec7f4c1759b35bb 100644 (file)
--- a/test/mail/0318.userx
+++ b/test/mail/0318.userx
@@ -2,8 +2,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
        (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>
 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 the first message.
 
 This is the first message.

diff --git a/test/mail/0319.saved b/test/mail/0319.saved
index d23681e94851da438f3d15135bbe28580ba09825..7ebe98d3ec630737289a1454cd698b3ad21d5d8d 100644 (file)
--- a/test/mail/0319.saved
+++ b/test/mail/0319.saved
@@ -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
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-subject: file
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

+subject: file

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is the first message.
 
 
 This is the first message.
 

diff --git a/test/mail/0321.CALLER b/test/mail/0321.CALLER
index 5d836a512ab7c0d9d7a0f21a051cf73d25d5aa19..bf5032fcede7c4764e76f4ff36afd3fc341e4383 100644 (file)
--- a/test/mail/0321.CALLER
+++ b/test/mail/0321.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
 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: |/bin/cat\ /etc/aliases\ @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
 X-Failed-Recipients: |/bin/cat\ /etc/aliases\ @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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -25,9 +25,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for |/bin/cat\ /etc/aliases\ @test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for |/bin/cat\ /etc/aliases\ @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>
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 quit
 
 
 quit
 

diff --git a/test/mail/0324.userx b/test/mail/0324.userx
index b83389d67ec0a1a466a7cf5cd0286104c48e0747..08c14924d94cb99c3cff8c58ab679a11dab5c4b8 100644 (file)
--- a/test/mail/0324.userx
+++ b/test/mail/0324.userx
@@ -3,6 +3,8 @@ 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
        (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>

 X-Long: This is a very long header
   continued...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   continued...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 X-Long: This is a very long header
   continued...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   continued...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa


@@ -661,9 +663,7 @@ X-Long: This is a very long header
   continued...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   This is the final line which should get chopped.
 X-Long: This is another header with the same name.   
   continued...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   This is the final line which should get chopped.
 X-Long: This is another header with the same name.   

-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 X-match: NO
 Y-match: NO
 Z-match: NO
 X-match: NO
 Y-match: NO
 Z-match: NO

diff --git a/test/mail/0326.userx b/test/mail/0326.userx
index 2beaf0d6b1bbd29ba23b62329ddb5d7506497b8c..5bb9ecbc24303a2be9f69a46f654f5d1304679d7 100644 (file)
--- a/test/mail/0326.userx
+++ b/test/mail/0326.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for pppp-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for pppp-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@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 OLP: pppp-userx
 OLP: pppp-userx
 
 OLP: pppp-userx
 OLP: pppp-userx
 


@@ -15,9 +15,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for userx+ssss@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for userx+ssss@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@test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 OLP: userx+ssss
 OLP: userx+ssss
 
 OLP: userx+ssss
 OLP: userx+ssss
 


@@ -27,9 +27,9 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 OLP: userx
 
 
 OLP: userx
 
 

diff --git a/test/mail/0327.userx b/test/mail/0327.userx
index 78566bda44223614346efefb6d41a2ea7bcd913a..ef8f8ac14682e8413134f648fa74bb241f97c969 100644 (file)
--- a/test/mail/0327.userx
+++ b/test/mail/0327.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 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
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999


@@ -13,8 +13,8 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0328.userx b/test/mail/0328.userx
index c000ee10febb6379bcd73048658dc9e1f82d2703..64849bbbf4a43c3e78b90a3c43f3ea33ca6ba244 100644 (file)
--- a/test/mail/0328.userx
+++ b/test/mail/0328.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 added: this header is added
 
 
 added: this header is added
 
 

diff --git a/test/mail/0329.userx b/test/mail/0329.userx
index c000ee10febb6379bcd73048658dc9e1f82d2703..64849bbbf4a43c3e78b90a3c43f3ea33ca6ba244 100644 (file)
--- a/test/mail/0329.userx
+++ b/test/mail/0329.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 added: this header is added
 
 
 added: this header is added
 
 

diff --git a/test/mail/0330.userz1 b/test/mail/0330.userz1
index 0c6f019261da0dcd388fa12a02c52f2afac02b79..49b05838134cf01d80a5c2133f64742411ce2f29 100644 (file)
--- a/test/mail/0330.userz1
+++ b/test/mail/0330.userz1
@@ -4,10 +4,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
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Remove: This header should go
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

+Remove: This header should go

 From: CALLER_NAME <CALLER@test.ex>
 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
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999


@@ -16,10 +16,10 @@ 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for UserY@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Remove: This header should go
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>

+Remove: This header should go

 From: CALLER_NAME <CALLER@test.ex>
 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
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999


@@ -28,9 +28,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Remove: This header should go
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>

+Remove: This header should go

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0335.batch b/test/mail/0335.batch
index 9af240869fdc9dfb6703081bf1b2b16576ce127a..e2e8f7f6e9eee7f7f8e80d2b9081866ab38e4cff 100644 (file)
--- a/test/mail/0335.batch
+++ b/test/mail/0335.batch
@@ -4,8 +4,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for batch@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for batch@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@test.ex>
 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0335.clone b/test/mail/0335.clone
index 9f5ca6e87409f99da1c0241b01bfde94da9ab9d9..cf4d861b820912973bebb9b668a5f23ed89d47a3 100644 (file)
--- a/test/mail/0335.clone
+++ b/test/mail/0335.clone
@@ -7,8 +7,8 @@ Envelope-to: clone@test.ex,
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0335.final b/test/mail/0335.final
index ce7ba659a8bf5d72aa5b423818acd3c1bd378e06..bac0183517eadef0d84e0ae265f7ce879ba72016 100644 (file)
--- a/test/mail/0335.final
+++ b/test/mail/0335.final
@@ -4,9 +4,9 @@ Envelope-to: onelevel2@test.ex,
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 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
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999


@@ -15,9 +15,9 @@ Envelope-to: top2@test.ex,
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 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
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999


@@ -28,8 +28,8 @@ Envelope-to: onelevel2@test.ex,
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0338.a1-userx b/test/mail/0338.a1-userx
index 8aaf5e497ff09ff9ba3f6cab1a520b358fa473c6..22dd5f6ade1184f8dac1d0bd2f0a111ac7beb152 100644 (file)
--- a/test/mail/0338.a1-userx
+++ b/test/mail/0338.a1-userx
@@ -4,8 +4,8 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0338.a2-userx b/test/mail/0338.a2-userx
index 8aaf5e497ff09ff9ba3f6cab1a520b358fa473c6..22dd5f6ade1184f8dac1d0bd2f0a111ac7beb152 100644 (file)
--- a/test/mail/0338.a2-userx
+++ b/test/mail/0338.a2-userx
@@ -4,8 +4,8 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0341.mailbox b/test/mail/0341.mailbox
index e02fff8bb17ceb3dc97a788e1a671921d2590e64..657b84c20f266f62dd61e1050e0e0c4bdedfa7c4 100644 (file)
--- a/test/mail/0341.mailbox
+++ b/test/mail/0341.mailbox
@@ -4,8 +4,8 @@ Envelope-to: userx@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
 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>
 Message-Id: <E10HmaX-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/0346.x b/test/mail/0346.x
index af1c48018129f25f3253b82f58092ac5af76a7b7..2d1d3daf8e010a18b44902a67a4e5a2b6c45aa6a 100644 (file)
--- a/test/mail/0346.x
+++ b/test/mail/0346.x
@@ -4,8 +4,8 @@ Envelope-to: x@dom1,
 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
 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>
 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/0349.xxxx b/test/mail/0349.xxxx
index 8d9e1de013a05ee140b040fac24522f3b22acf86..34283efd46158c3afd9925a2d650fb6f95b06514 100644 (file)
--- a/test/mail/0349.xxxx
+++ b/test/mail/0349.xxxx
@@ -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
        (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>
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Testing, testing
 
 
 Testing, testing
 

diff --git a/test/mail/0351.userx b/test/mail/0351.userx
index a0e4872f97791741e8b56c3582e8f39f349c6b27..50bfd7d6cae8e9e3d33c109edeb8add3a380fc46 100644 (file)
--- a/test/mail/0351.userx
+++ b/test/mail/0351.userx
@@ -3,6 +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
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000
+Resent-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

 To: userx@test.ex
 To: usery@test.ex
 Cc: Him@test.ex
 To: userx@test.ex
 To: usery@test.ex
 Cc: Him@test.ex


@@ -13,9 +15,7 @@ Resent-to: a@b, aa@bb
 Resent-to: c@d
 Reply-to: r@s
 Reply-to: t@u
 Resent-to: c@d
 Reply-to: r@s
 Reply-to: t@u

-Resent-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

 Resent-From: CALLER_NAME <CALLER@test.ex>
 Resent-From: CALLER_NAME <CALLER@test.ex>

-Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000

 Found: yes
 Found2: yes
 FOUND-found2: !!
 Found: yes
 Found2: yes
 FOUND-found2: !!


@@ -39,6 +39,8 @@ ALL: 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000
+Resent-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

 To: userx@test.ex
 To: usery@test.ex
 Cc: Him@test.ex
 To: userx@test.ex
 To: usery@test.ex
 Cc: Him@test.ex


@@ -49,9 +51,7 @@ Resent-to: a@b, aa@bb
 Resent-to: c@d
 Reply-to: r@s
 Reply-to: t@u
 Resent-to: c@d
 Reply-to: r@s
 Reply-to: t@u

-Resent-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

 Resent-From: CALLER_NAME <CALLER@test.ex>
 Resent-From: CALLER_NAME <CALLER@test.ex>

-Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000

 Found: yes
 Found2: yes
 
 Found: yes
 Found2: yes
 

diff --git a/test/mail/0352.userx b/test/mail/0352.userx
index 4b16d1949119339baacd0c4734caca5972515708..be18e80779e95c454545ead4d8fd45689bf72f42 100644 (file)
--- a/test/mail/0352.userx
+++ b/test/mail/0352.userx
@@ -3,11 +3,11 @@ 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
        (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:                      
 To:                         
 From:                      
 To:                         

-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

 Sender: CALLER_NAME <CALLER@test.ex>
 Sender: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 Found: abcd no
 Found: xyz no
 TO: ><
 Found: abcd no
 Found: xyz no
 TO: ><


@@ -19,13 +19,13 @@ 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
        (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>

 To: abcd@test.ex
 To:         
 To: xyz@test.ex
 To: pqr@test.ex
 To: abcd@test.ex
 To:         
 To: xyz@test.ex
 To: pqr@test.ex

-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 Found: abcd yes
 Found: xyz yes
 TO: >abcd@test.ex,
 Found: abcd yes
 Found: xyz yes
 TO: >abcd@test.ex,


@@ -39,13 +39,13 @@ 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
        (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>

 To:         
 To: abcd@test.ex
 To: xyz@test.ex
 To: pqr@test.ex
 To:         
 To: abcd@test.ex
 To: xyz@test.ex
 To: pqr@test.ex

-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 Found: abcd yes
 Found: xyz yes
 TO: >abcd@test.ex,
 Found: abcd yes
 Found: xyz yes
 TO: >abcd@test.ex,


@@ -59,13 +59,13 @@ 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
        (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>

 To: abcd@test.ex
 To: xyz@test.ex
 To: pqr@test.ex
 To:         
 To: abcd@test.ex
 To: xyz@test.ex
 To: pqr@test.ex
 To:         

-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 Found: abcd yes
 Found: xyz yes
 TO: >abcd@test.ex,
 Found: abcd yes
 Found: xyz yes
 TO: >abcd@test.ex,

diff --git a/test/mail/0359.userx b/test/mail/0359.userx
index 67eae78d37492b95df5b22d3c9d2481f88469f21..72147a6e95442b5b4e9638a8272856618b37b123 100644 (file)
--- a/test/mail/0359.userx
+++ b/test/mail/0359.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
        (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>
 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-shadowed:
 
 
 X-shadowed:
 
 

diff --git a/test/mail/0374.CALLER b/test/mail/0374.CALLER
index 36e4ef01473f14a9891226a8564b362e90a5c9de..1b7454e1ad3bde6e6a9c3b2471bb05685b41f4cb 100644 (file)
--- a/test/mail/0374.CALLER
+++ b/test/mail/0374.CALLER
@@ -4,14 +4,14 @@ Envelope-to: CALLER@myhost.test.ex
 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
 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: d3@myhost.test.ex,
   b1@myhost.test.ex
 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
 X-Failed-Recipients: d3@myhost.test.ex,
   b1@myhost.test.ex
 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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -30,8 +30,8 @@ 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
 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>
 Message-Id: <E10HmaX-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/0374.a1 b/test/mail/0374.a1
index 7f05c69fcaf5e2419c4e6bc9817ab1505b70ee87..0cfab456eb6af5caf16ce0bf9d2cbbbd7649e655 100644 (file)
--- a/test/mail/0374.a1
+++ b/test/mail/0374.a1
@@ -4,8 +4,8 @@ Envelope-to: a1@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
 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>
 Message-Id: <E10HmaX-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/0374.a1-u b/test/mail/0374.a1-u
index 7f05c69fcaf5e2419c4e6bc9817ab1505b70ee87..0cfab456eb6af5caf16ce0bf9d2cbbbd7649e655 100644 (file)
--- a/test/mail/0374.a1-u
+++ b/test/mail/0374.a1-u
@@ -4,8 +4,8 @@ Envelope-to: a1@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
 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>
 Message-Id: <E10HmaX-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/0374.b1 b/test/mail/0374.b1
index 0828f8915983310aeabcbb828fc807ccbe061f6d..55805eee0b77e6717dab3618a7c023306813266d 100644 (file)
--- a/test/mail/0374.b1
+++ b/test/mail/0374.b1
@@ -4,8 +4,8 @@ Envelope-to: b1@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
 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>
 Message-Id: <E10HmaX-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/0374.c1 b/test/mail/0374.c1
index 34b259b5706a0d6b6b8dcc7e5846f96a29ee2311..7d9557c426995fb1ed982e6ed9091023fe432fe4 100644 (file)
--- a/test/mail/0374.c1
+++ b/test/mail/0374.c1
@@ -4,8 +4,8 @@ Envelope-to: c1@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
 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>
 Message-Id: <E10HmaX-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/0374.d1 b/test/mail/0374.d1
index f8f550a4b76a732ea7c396d0bbd658a14d15215d..450c5a126e4b1f351ef584ebab884dd8bc0c1ba9 100644 (file)
--- a/test/mail/0374.d1
+++ b/test/mail/0374.d1
@@ -4,8 +4,8 @@ Envelope-to: d1@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
 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>
 Message-Id: <E10HmaX-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/0374.d2 b/test/mail/0374.d2
index 10a2fd8aed63557430b06eee3a6386422c7a81c3..37873010028964822bf335881b1c5a872a888153 100644 (file)
--- a/test/mail/0374.d2
+++ b/test/mail/0374.d2
@@ -4,8 +4,8 @@ Envelope-to: d2@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
 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>
 Message-Id: <E10HmaX-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/0374.d3 b/test/mail/0374.d3
index bf4454b6a1af27ce74c214a78d4afa18dd0ab990..d52db4b68948ad7b598cb82b26bc1e5dcacbae5b 100644 (file)
--- a/test/mail/0374.d3
+++ b/test/mail/0374.d3
@@ -4,8 +4,8 @@ Envelope-to: d3@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
 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>
 Message-Id: <E10HmaX-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/0375.CALLER b/test/mail/0375.CALLER
index 9fc9424a9629285122d0b644415e9a9af9d978ad..70ac5ad1a76e186f290dc1b555b17b1933b63957 100644 (file)
--- a/test/mail/0375.CALLER
+++ b/test/mail/0375.CALLER
@@ -4,13 +4,13 @@ Envelope-to: CALLER@myhost.test.ex
 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
 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: e1@myhost.test.ex
 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
 X-Failed-Recipients: e1@myhost.test.ex
 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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -27,8 +27,8 @@ 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
 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>
 Message-Id: <E10HmaX-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/0375.a1 b/test/mail/0375.a1
index 7f05c69fcaf5e2419c4e6bc9817ab1505b70ee87..0cfab456eb6af5caf16ce0bf9d2cbbbd7649e655 100644 (file)
--- a/test/mail/0375.a1
+++ b/test/mail/0375.a1
@@ -4,8 +4,8 @@ Envelope-to: a1@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
 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>
 Message-Id: <E10HmaX-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/0375.a1-u b/test/mail/0375.a1-u
index 031e92c385f1e1eba7f7172b41b7e67f8c5be025..686b60ab52a12effd43586689a2073d30ae2995e 100644 (file)
--- a/test/mail/0375.a1-u
+++ b/test/mail/0375.a1-u
@@ -4,8 +4,8 @@ Envelope-to: a1@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
 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>
 Message-Id: <E10HmaX-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/0375.b1 b/test/mail/0375.b1
index 0828f8915983310aeabcbb828fc807ccbe061f6d..55805eee0b77e6717dab3618a7c023306813266d 100644 (file)
--- a/test/mail/0375.b1
+++ b/test/mail/0375.b1
@@ -4,8 +4,8 @@ Envelope-to: b1@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
 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>
 Message-Id: <E10HmaX-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/0375.c1 b/test/mail/0375.c1
index 34b259b5706a0d6b6b8dcc7e5846f96a29ee2311..7d9557c426995fb1ed982e6ed9091023fe432fe4 100644 (file)
--- a/test/mail/0375.c1
+++ b/test/mail/0375.c1
@@ -4,8 +4,8 @@ Envelope-to: c1@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
 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>
 Message-Id: <E10HmaX-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/0375.d1 b/test/mail/0375.d1
index f8f550a4b76a732ea7c396d0bbd658a14d15215d..450c5a126e4b1f351ef584ebab884dd8bc0c1ba9 100644 (file)
--- a/test/mail/0375.d1
+++ b/test/mail/0375.d1
@@ -4,8 +4,8 @@ Envelope-to: d1@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
 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>
 Message-Id: <E10HmaX-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/0375.d2 b/test/mail/0375.d2
index 10a2fd8aed63557430b06eee3a6386422c7a81c3..37873010028964822bf335881b1c5a872a888153 100644 (file)
--- a/test/mail/0375.d2
+++ b/test/mail/0375.d2
@@ -4,8 +4,8 @@ Envelope-to: d2@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
 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>
 Message-Id: <E10HmaX-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/0375.d3 b/test/mail/0375.d3
index bf4454b6a1af27ce74c214a78d4afa18dd0ab990..d52db4b68948ad7b598cb82b26bc1e5dcacbae5b 100644 (file)
--- a/test/mail/0375.d3
+++ b/test/mail/0375.d3
@@ -4,8 +4,8 @@ Envelope-to: d3@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
 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>
 Message-Id: <E10HmaX-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/0375.e1 b/test/mail/0375.e1
index 207f5a3af2a08635ff40a365f1ef348de6f6c80c..a7499ebc74e2ed2cb2208eb894d6637377293043 100644 (file)
--- a/test/mail/0375.e1
+++ b/test/mail/0375.e1
@@ -4,8 +4,8 @@ Envelope-to: e1@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
 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>
 Message-Id: <E10HmaX-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/0375.f1 b/test/mail/0375.f1
index 91e6b315674906c30c3527b9ad36a3df76c1ac9e..e478848dad83233b17c12c46a374146fb0c9555a 100644 (file)
--- a/test/mail/0375.f1
+++ b/test/mail/0375.f1
@@ -4,8 +4,8 @@ Envelope-to: f1@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
 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>
 Message-Id: <E10HmaX-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/0375.f2 b/test/mail/0375.f2
index c0f59bf1c1f32df5a60c9707280f2824fc16bf3a..93dc521d29f13bd68d33d6a5412b20f781093ecc 100644 (file)
--- a/test/mail/0375.f2
+++ b/test/mail/0375.f2
@@ -4,8 +4,8 @@ Envelope-to: f2@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
 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>
 Message-Id: <E10HmaX-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/0375.f3 b/test/mail/0375.f3
index 96c0c3ebb13bcd34df9ede779ee8e98f9883c04d..b7a828a74a148d67c7b3fdc0f177bb2a56db5249 100644 (file)
--- a/test/mail/0375.f3
+++ b/test/mail/0375.f3
@@ -4,8 +4,8 @@ Envelope-to: f3@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
 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>
 Message-Id: <E10HmaX-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/0375.h1 b/test/mail/0375.h1
index 7e0faaeac0fc0a81aa3a374dd4b5950fb67bffb2..ed9d1733194e45479923a341c9266c320d434651 100644 (file)
--- a/test/mail/0375.h1
+++ b/test/mail/0375.h1
@@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for h1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for h1@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>
 Message-Id: <E10HmaZ-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/0375.h1-u b/test/mail/0375.h1-u
index 7e0faaeac0fc0a81aa3a374dd4b5950fb67bffb2..ed9d1733194e45479923a341c9266c320d434651 100644 (file)
--- a/test/mail/0375.h1-u
+++ b/test/mail/0375.h1-u
@@ -5,8 +5,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for h1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for h1@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>
 Message-Id: <E10HmaZ-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/0377.aaaa b/test/mail/0377.aaaa
index 872481d91376a8813cf0572d7b72f09904ffd535..8bdec08a5e26ce27f4d6986e0f0a9263d547e7ce 100644 (file)
--- a/test/mail/0377.aaaa
+++ b/test/mail/0377.aaaa
@@ -2,8 +2,8 @@ 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
 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>
 Message-Id: <E10HmaX-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/0377.bbbb b/test/mail/0377.bbbb
index 872481d91376a8813cf0572d7b72f09904ffd535..8bdec08a5e26ce27f4d6986e0f0a9263d547e7ce 100644 (file)
--- a/test/mail/0377.bbbb
+++ b/test/mail/0377.bbbb
@@ -2,8 +2,8 @@ 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
 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>
 Message-Id: <E10HmaX-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/0377.cccc b/test/mail/0377.cccc
index 872481d91376a8813cf0572d7b72f09904ffd535..8bdec08a5e26ce27f4d6986e0f0a9263d547e7ce 100644 (file)
--- a/test/mail/0377.cccc
+++ b/test/mail/0377.cccc
@@ -2,8 +2,8 @@ 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
 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>
 Message-Id: <E10HmaX-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/0378.file b/test/mail/0378.file
index 71b909d6d7e50869922d599a46f721d014d75b70..37cef87631ec50ab7e97619e9493d0588b3bbb2b 100644 (file)
--- a/test/mail/0378.file
+++ b/test/mail/0378.file
@@ -3,8 +3,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for aaaa@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for aaaa@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>
 Message-Id: <E10HmaX-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/0379.bbbb b/test/mail/0379.bbbb
index 872481d91376a8813cf0572d7b72f09904ffd535..8bdec08a5e26ce27f4d6986e0f0a9263d547e7ce 100644 (file)
--- a/test/mail/0379.bbbb
+++ b/test/mail/0379.bbbb
@@ -2,8 +2,8 @@ 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
 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>
 Message-Id: <E10HmaX-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/0379.cccc b/test/mail/0379.cccc
index 872481d91376a8813cf0572d7b72f09904ffd535..8bdec08a5e26ce27f4d6986e0f0a9263d547e7ce 100644 (file)
--- a/test/mail/0379.cccc
+++ b/test/mail/0379.cccc
@@ -2,8 +2,8 @@ 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
 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>
 Message-Id: <E10HmaX-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/0380.bbbb b/test/mail/0380.bbbb
index 872481d91376a8813cf0572d7b72f09904ffd535..8bdec08a5e26ce27f4d6986e0f0a9263d547e7ce 100644 (file)
--- a/test/mail/0380.bbbb
+++ b/test/mail/0380.bbbb
@@ -2,8 +2,8 @@ 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
 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>
 Message-Id: <E10HmaX-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/0383.CALLER b/test/mail/0383.CALLER
index e54e474fa51288360aed7ba01b274475e5d63621..f151d9e4679317f6868cbc20fc23b584dde9ea53 100644 (file)
--- a/test/mail/0383.CALLER
+++ b/test/mail/0383.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@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex 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@myhost.test.ex>

 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
 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@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -56,10 +56,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for alice@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for alice@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-To: alice@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

+To: alice@test.ex

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 ------------------
 
 
 ------------------


@@ -71,23 +71,23 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for alice@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for alice@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-To: alice@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

+To: alice@test.ex

 From: CALLER_NAME <CALLER@test.ex>
 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 myhost.test.ex with local (Exim x.yz)
        id 10HmbA-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 
 
 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@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: 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
 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@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -134,10 +134,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for jabberwocky@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for jabberwocky@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-To: jabberwocky@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>

+To: jabberwocky@test.ex

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 ------------------
 
 
 ------------------


@@ -149,23 +149,23 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for jabberwocky@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for jabberwocky@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-To: jabberwocky@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>

+To: jabberwocky@test.ex

 From: CALLER_NAME <CALLER@test.ex>
 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 myhost.test.ex with local (Exim x.yz)
        id 10HmbC-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 
 
 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 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@myhost.test.ex>

 X-Failed-Recipients: redking@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
 X-Failed-Recipients: redking@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@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -213,10 +213,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
        for redking@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
        for redking@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-To: redking@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>

+To: redking@test.ex

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 ------------------
 
 
 ------------------


@@ -228,9 +228,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
        for redking@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
        for redking@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-To: redking@test.ex
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>

+To: redking@test.ex

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0385.CALLER b/test/mail/0385.CALLER
index cd43c268bb338fcd723f483db5a5beed3efed8e5..f79ca70afd8b01be68c0635575bce55d8c1d251a 100644 (file)
--- a/test/mail/0385.CALLER
+++ b/test/mail/0385.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@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex 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@myhost.test.ex>

 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
 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: <E10HmaY-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -25,10 +25,10 @@ Received: from CALLER by myhost.test.ex 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: body size = 2
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

+Subject: body size = 2

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 X
 
 
 X
 


@@ -36,13 +36,13 @@ 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@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex 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@myhost.test.ex>

 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
 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: <E10HmbA-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -59,10 +59,10 @@ Received: from CALLER by myhost.test.ex 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: body size = 200
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>

+Subject: body size = 200

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX


@@ -73,13 +73,13 @@ 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 CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex 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@myhost.test.ex>

 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
 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: <E10HmbC-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -96,10 +96,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: body size = 1600
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>

+Subject: body size = 1600

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX


@@ -138,13 +138,13 @@ 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 CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex 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@myhost.test.ex>

 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
 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: <E10HmbE-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -163,9 +163,9 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

diff --git a/test/mail/0393.userx b/test/mail/0393.userx
index ab724c4ef3c266a40616c51c4a09acd0027e33ca..3358d1ee9291e1c07fcf7b5b858605299f027de8 100644 (file)
--- a/test/mail/0393.userx
+++ b/test/mail/0393.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@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (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>
 Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Testing with filter
 
 
 Testing with filter
 

diff --git a/test/mail/0395.CALLER b/test/mail/0395.CALLER
index 55c623f70473fcf96b88fe7327095cd3c6783ab5..d7285f91e7dfd5bf0003247e17f1059b542dc25d 100644 (file)
--- a/test/mail/0395.CALLER
+++ b/test/mail/0395.CALLER
@@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaX-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        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>

 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail failure - malformed recipient address
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 Subject: Mail failure - malformed recipient address

-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 A message that you sent contained a recipient address that was incorrectly
 constructed:
 
 A message that you sent contained a recipient address that was incorrectly
 constructed:

diff --git a/test/mail/0395.userx b/test/mail/0395.userx
index 5c7e799bf8776d2f04619abb05ed65a7470f9623..a8f10e53e7f3f62169d2b3c224151cd841879299 100644 (file)
--- a/test/mail/0395.userx
+++ b/test/mail/0395.userx
@@ -3,11 +3,11 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for userx@origin.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for userx@origin.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: philip
 To: userx
 From: philip
 To: userx

-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>

 Sender: CALLER_NAME <CALLER@test.ex>
 Sender: 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
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999


@@ -15,11 +15,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@origin.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for userx@origin.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: userx@origin.ex
 To: userx@test.ex
 From: userx@origin.ex
 To: userx@test.ex

-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>

 Sender: CALLER_NAME <CALLER@test.ex>
 Sender: 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
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999


@@ -27,11 +27,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
        (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: userx@test.ex
 To: userx@test.ex
 From: userx@test.ex
 To: userx@test.ex

-Message-Id: <E10HmbA-0005vi-00@the.local.host.name>

 Sender: CALLER_NAME <CALLER@test.ex>
 Sender: 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
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999


@@ -39,10 +39,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
        for userx@origin.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
        for userx@origin.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: philip
 To: userx
 From: philip
 To: userx

-Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999


@@ -50,11 +50,11 @@ Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbC-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (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: userx
 To: userx
 From: userx
 To: userx

-Message-Id: <E10HmbC-0005vi-00@the.local.host.name>

 Sender: CALLER_NAME <CALLER@test.ex>
 Sender: 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
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999


@@ -62,11 +62,11 @@ Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbD-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (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: userx@test.ex
 To: userx@test.ex
 From: userx@test.ex
 To: userx@test.ex

-Message-Id: <E10HmbD-0005vi-00@the.local.host.name>

 Sender: CALLER_NAME <CALLER@test.ex>
 Sender: 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
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999


@@ -74,11 +74,11 @@ Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbE-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (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: userx
 To: userx
 From: userx
 To: userx

-Message-Id: <E10HmbE-0005vi-00@the.local.host.name>

 Sender: CALLER_NAME <CALLER@test.ex>
 Sender: 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
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999


@@ -86,10 +86,10 @@ Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbF-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (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: userx@test.ex
 To: userx@test.ex
 From: userx@test.ex
 To: userx@test.ex

-Message-Id: <E10HmbF-0005vi-00@the.local.host.name>

 Sender: CALLER_NAME <CALLER@test.ex>
 Sender: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0398.x b/test/mail/0398.x
index 85dde19fda46f4533d2d11588db62a58f63dbaa8..9c05c7c18bdc1928f35e9832534e00b9fb9c1115 100644 (file)
--- a/test/mail/0398.x
+++ b/test/mail/0398.x
@@ -3,9 +3,9 @@ Received: from CALLER by mail.test.ex with local-smtp (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for x@local; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for x@local; Tue, 2 Mar 1999 09:44:33 +0000

+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Testing
 
 
 Testing
 

diff --git a/test/mail/0404.sender b/test/mail/0404.sender
index fd77af8fe4053d3bbebc22d4f9009f1871549333..d75996222cad1190f3a2646c4b2f38217c54bfad 100644 (file)
--- a/test/mail/0404.sender
+++ b/test/mail/0404.sender
@@ -1,13 +1,13 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
        id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
        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@mail.test.ex>

 To: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex
 In-Reply-To: <E10HmaX-0005vi-00@mail.test.ex>
 References: <E10HmaX-0005vi-00@mail.test.ex>
 Auto-Submitted: auto-replied
 To: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex
 In-Reply-To: <E10HmaX-0005vi-00@mail.test.ex>
 References: <E10HmaX-0005vi-00@mail.test.ex>
 Auto-Submitted: auto-replied

-Message-Id: <E10HmaY-0005vi-00@mail.test.ex>

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 rhubarb
 
 
 rhubarb
 

diff --git a/test/mail/0408.userx b/test/mail/0408.userx
index 159be982377ba23ea6d60973f426c91d95e6ce40..99f22673ebc8877773998a693ddadb64daf83ba1 100644 (file)
--- a/test/mail/0408.userx
+++ b/test/mail/0408.userx
@@ -3,8 +3,8 @@ Received: from CALLER by mail.test.ex 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
        (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@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0411.afolder b/test/mail/0411.afolder
index 96b94a18981503d01b9d574599d9ed5c50cb3819..18cb667c455a2b8d18aca6036422247c3e06c396 100644 (file)
--- a/test/mail/0411.afolder
+++ b/test/mail/0411.afolder
@@ -3,17 +3,17 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for t1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for t1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 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
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by mail.test.ex 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@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaY-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0412.CALLER b/test/mail/0412.CALLER
index 260252bebdf6a1118d90e05a2fb031a26cfd9162..89b8a60fef1e1f196598879b446b027d54bda827 100644 (file)
--- a/test/mail/0412.CALLER
+++ b/test/mail/0412.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
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-From: CALLER_NAME <CALLER@test.ex>
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

 Date: 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>

 Found: no
 
 FROM: CALLER_NAME <CALLER@test.ex>
 Found: no
 
 FROM: CALLER_NAME <CALLER@test.ex>


@@ -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 CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        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>

 Reply-to:
 From: CALLER_NAME <CALLER@test.ex>
 Reply-to:
 From: CALLER_NAME <CALLER@test.ex>

-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 Found: no
 
 FROM: CALLER_NAME <CALLER@test.ex>
 Found: no
 
 FROM: CALLER_NAME <CALLER@test.ex>


@@ -38,10 +38,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        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>

 Reply-to: usery@test.ex
 From: CALLER_NAME <CALLER@test.ex>
 Reply-to: usery@test.ex
 From: CALLER_NAME <CALLER@test.ex>

-Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 Found: no
 
 FROM: CALLER_NAME <CALLER@test.ex>
 Found: no
 
 FROM: CALLER_NAME <CALLER@test.ex>


@@ -56,10 +56,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-From:
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbA-0005vi-00@the.local.host.name>

+From:

 Sender: CALLER_NAME <CALLER@test.ex>
 Sender: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 Found: no
 
 FROM: 
 Found: no
 
 FROM: 

diff --git a/test/mail/0421.a b/test/mail/0421.a
index e8cc113a5f9c30346c04f326049ff90557f409b3..6fb4b78c5aa84b4d0bc92144ae364bc950de58fd 100644 (file)
--- a/test/mail/0421.a
+++ b/test/mail/0421.a
@@ -3,12 +3,12 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for a@b.c; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for a@b.c; Tue, 2 Mar 1999 09:44:33 +0000

+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@mail.test.ex>

 From: abc@x.y.z
 To: abc@x.y.z
 Reply-to: abc@x.y.z
 From: abc@x.y.z
 To: abc@x.y.z
 Reply-to: abc@x.y.z

-Message-Id: <E10HmaX-0005vi-00@mail.test.ex>

 Sender: CALLER_NAME <abc@x.y.z>
 Sender: CALLER_NAME <abc@x.y.z>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 Reply-to: abc@x.y.z
 
 
 Reply-to: abc@x.y.z
 
 

diff --git a/test/mail/0428.CALLER b/test/mail/0428.CALLER
index 2cea2cb9bc4f34cc4faa2857fbd093acafad4153..e6cdf9e354106a182e9dddc8f701ab63f08d7755 100644 (file)
--- a/test/mail/0428.CALLER
+++ b/test/mail/0428.CALLER
@@ -5,13 +5,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by mail.test.ex with local (Exim x.yz)
        id 10HmbC-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by mail.test.ex 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@mail.test.ex>

 X-Failed-Recipients: restrict-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
 X-Failed-Recipients: restrict-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@mail.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -28,10 +28,10 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
        for restrict-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
        for restrict-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Filter: require "fileinto"; fileinto "userx-extra";
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbB-0005vi-00@mail.test.ex>
 Message-Id: <E10HmbB-0005vi-00@mail.test.ex>

+Filter: require "fileinto"; fileinto "userx-extra";

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test 5
 
 
 Test 5
 


@@ -42,13 +42,13 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by mail.test.ex with local (Exim x.yz)
        id 10HmbE-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by mail.test.ex 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@mail.test.ex>

 X-Failed-Recipients: restrict-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
 X-Failed-Recipients: restrict-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: <E10HmbE-0005vi-00@mail.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -65,10 +65,10 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbD-0005vi-00
        for restrict-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbD-0005vi-00
        for restrict-userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Filter: fileinto "userx-extra";
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbD-0005vi-00@mail.test.ex>
 Message-Id: <E10HmbD-0005vi-00@mail.test.ex>

+Filter: fileinto "userx-extra";

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test 6
 
 
 Test 6
 

diff --git a/test/mail/0428.inbox.JUNK b/test/mail/0428.inbox.JUNK
index 088f808c73d6ccab0f040a7231701242283954bc..6d83deb36fc02c82f350d52bb209b429383ee0e4 100644 (file)
--- a/test/mail/0428.inbox.JUNK
+++ b/test/mail/0428.inbox.JUNK
@@ -6,15 +6,15 @@ Received: from CALLER by mail.test.ex 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
        (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@mail.test.ex>

 X-Sieve: 99
 Filter: require["fileinto","comparator-i;ascii-numeric"];
         if header :comparator "i;ascii-numeric" "X-Sieve" "99" {
           fileinto "inbox.JUNK";
           stop;
         }
 X-Sieve: 99
 Filter: require["fileinto","comparator-i;ascii-numeric"];
         if header :comparator "i;ascii-numeric" "X-Sieve" "99" {
           fileinto "inbox.JUNK";
           stop;
         }

-Message-Id: <E10HmbG-0005vi-00@mail.test.ex>

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test 8
 
 
 Test 8
 


@@ -26,15 +26,15 @@ Received: from CALLER by mail.test.ex 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
        (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@mail.test.ex>

 X-Sieve: 99-
 Filter: require["fileinto","comparator-i;ascii-numeric"];
         if header :comparator "i;ascii-numeric" "X-Sieve" "99" {
           fileinto "inbox.JUNK";
           stop;
         }
 X-Sieve: 99-
 Filter: require["fileinto","comparator-i;ascii-numeric"];
         if header :comparator "i;ascii-numeric" "X-Sieve" "99" {
           fileinto "inbox.JUNK";
           stop;
         }

-Message-Id: <E10HmbI-0005vi-00@mail.test.ex>

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test 10
 
 
 Test 10
 


@@ -46,15 +46,15 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbJ-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbJ-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: <E10HmbJ-0005vi-00@mail.test.ex>

 X-Sieve: -99
 Filter: require["fileinto","comparator-i;ascii-numeric"];
         if header :comparator "i;ascii-numeric" "X-Sieve" "-99" {
           fileinto "inbox.JUNK";
           stop;
         }
 X-Sieve: -99
 Filter: require["fileinto","comparator-i;ascii-numeric"];
         if header :comparator "i;ascii-numeric" "X-Sieve" "-99" {
           fileinto "inbox.JUNK";
           stop;
         }

-Message-Id: <E10HmbJ-0005vi-00@mail.test.ex>

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test 11
 
 
 Test 11
 


@@ -66,15 +66,15 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbK-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbK-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: <E10HmbK-0005vi-00@mail.test.ex>

 X-Sieve: -99
 Filter: require["fileinto","comparator-i;ascii-numeric"];
         if header :comparator "i;ascii-numeric" "X-Sieve" "-98" {
           fileinto "inbox.JUNK";
           stop;
         }
 X-Sieve: -99
 Filter: require["fileinto","comparator-i;ascii-numeric"];
         if header :comparator "i;ascii-numeric" "X-Sieve" "-98" {
           fileinto "inbox.JUNK";
           stop;
         }

-Message-Id: <E10HmbK-0005vi-00@mail.test.ex>

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test 12
 
 
 Test 12
 

diff --git a/test/mail/0428.redirected b/test/mail/0428.redirected
index fc048367bee73092e69ae79c4592f7a1ffc802d6..b436d75f4741476402702c964856866ebb63ec4a 100644 (file)
--- a/test/mail/0428.redirected
+++ b/test/mail/0428.redirected
@@ -6,10 +6,10 @@ Received: from CALLER by mail.test.ex 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Filter: redirect "redirected@test.ex";
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbA-0005vi-00@mail.test.ex>
 Message-Id: <E10HmbA-0005vi-00@mail.test.ex>

+Filter: redirect "redirected@test.ex";

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test 4
 
 
 Test 4
 

diff --git a/test/mail/0428.someone b/test/mail/0428.someone
index a3ba52b88efbc41b9d03fcb7c0bd1ad818174334..65e5628d9d937233b8512ed9d2ea1d1a08512c9d 100644 (file)
--- a/test/mail/0428.someone
+++ b/test/mail/0428.someone
@@ -5,6 +5,8 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
        id 10HmbM-0005vi-00
        for someone@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
        id 10HmbM-0005vi-00
        for someone@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbM-0005vi-00@mail.test.ex>

 From: userx@test.ex
 To: someone@test.ex
 Subject: Automated reply
 From: userx@test.ex
 To: someone@test.ex
 Subject: Automated reply


@@ -15,8 +17,6 @@ MIME-Version: 1.0
 Content-Type: text/plain;
        charset="utf-8"
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain;
        charset="utf-8"
 Content-Transfer-Encoding: quoted-printable

-Message-Id: <E10HmbM-0005vi-00@mail.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 I am gone.  Not here.
 
 
 I am gone.  Not here.
 

diff --git a/test/mail/0428.userx b/test/mail/0428.userx
index 8c3402bd77c122324e7a106ad28ba58cdf40d6da..3e9cbd4f5ddd9d4cafb0f9d4f52a270d8e6d7fe6 100644 (file)
--- a/test/mail/0428.userx
+++ b/test/mail/0428.userx
@@ -6,9 +6,9 @@ Received: from CALLER by mail.test.ex 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
        (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@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test 1
 
 
 Test 1
 


@@ -20,10 +20,10 @@ Received: from CALLER by mail.test.ex 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
        (envelope-from <CALLER@test.ex>)
        id 10HmbF-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Filter: if true { stop; fileinto "inbox.never"; }
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbF-0005vi-00@mail.test.ex>
 Message-Id: <E10HmbF-0005vi-00@mail.test.ex>

+Filter: if true { stop; fileinto "inbox.never"; }

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test 7
 
 
 Test 7
 


@@ -35,15 +35,15 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbH-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@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@mail.test.ex>

 X-Sieve: 99
 Filter: require["fileinto","comparator-i;ascii-numeric"];
         if header :comparator "i;ascii-numeric" "X-Sieve" "98" {
           fileinto "inbox.JUNK";
           stop;
         }
 X-Sieve: 99
 Filter: require["fileinto","comparator-i;ascii-numeric"];
         if header :comparator "i;ascii-numeric" "X-Sieve" "98" {
           fileinto "inbox.JUNK";
           stop;
         }

-Message-Id: <E10HmbH-0005vi-00@mail.test.ex>

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test 9
 
 
 Test 9
 


@@ -55,12 +55,12 @@ Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <someone@test.ex>)
        id 10HmbL-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <someone@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@mail.test.ex>

 To: userx@test.ex
 Filter: require ["vacation"]; 
         vacation "I am gone.  Not here.";
 To: userx@test.ex
 Filter: require ["vacation"]; 
         vacation "I am gone.  Not here.";

-Message-Id: <E10HmbL-0005vi-00@mail.test.ex>

 From: someone@test.ex
 From: someone@test.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test 13
 
 
 Test 13
 


@@ -71,15 +71,15 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <someone@test.ex>)
        id 10HmbN-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <someone@test.ex>)
        id 10HmbN-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000

+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbN-0005vi-00@mail.test.ex>

 To: userx-suffix@test.ex
 Filter: require ["envelope","fileinto"]; 
         if envelope :matches :localpart "to" "*-suffix" {
           fileinto "userx-sawsuffix";
           stop; 
         }   
 To: userx-suffix@test.ex
 Filter: require ["envelope","fileinto"]; 
         if envelope :matches :localpart "to" "*-suffix" {
           fileinto "userx-sawsuffix";
           stop; 
         }   

-Message-Id: <E10HmbN-0005vi-00@mail.test.ex>

 From: someone@test.ex
 From: someone@test.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test 14
 
 
 Test 14
 

diff --git a/test/mail/0428.userx-extra b/test/mail/0428.userx-extra
index d7dc5ae1bcb47072c9fb220bc0a2c72ceccc67d9..6e10c9d4eb3d612707ae42ed95b5eeace318da88 100644 (file)
--- a/test/mail/0428.userx-extra
+++ b/test/mail/0428.userx-extra
@@ -6,10 +6,10 @@ Received: from CALLER by mail.test.ex 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Filter: require "fileinto"; fileinto "userx-extra";
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaZ-0005vi-00@mail.test.ex>
 Message-Id: <E10HmaZ-0005vi-00@mail.test.ex>

+Filter: require "fileinto"; fileinto "userx-extra";

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test 3
 
 
 Test 3
 

diff --git a/test/mail/0428.userx-sawsuffix b/test/mail/0428.userx-sawsuffix
index ef2e8b5e35afef158b65a26e876cd4c263e5325e..6bb06083229be654a303a26c8799423bc08367bb 100644 (file)
--- a/test/mail/0428.userx-sawsuffix
+++ b/test/mail/0428.userx-sawsuffix
@@ -5,15 +5,15 @@ Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <someone@test.ex>)
        id 10HmbN-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <someone@test.ex>)
        id 10HmbN-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000

+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbN-0005vi-00@mail.test.ex>

 To: userx-suffix@test.ex
 Filter: require ["envelope","fileinto"]; 
         if envelope :matches :localpart "to" "*-suffix" {
           fileinto "userx-sawsuffix";
           stop; 
         }   
 To: userx-suffix@test.ex
 Filter: require ["envelope","fileinto"]; 
         if envelope :matches :localpart "to" "*-suffix" {
           fileinto "userx-sawsuffix";
           stop; 
         }   

-Message-Id: <E10HmbN-0005vi-00@mail.test.ex>

 From: someone@test.ex
 From: someone@test.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test 14
 
 
 Test 14
 

diff --git a/test/mail/0431.xxx b/test/mail/0431.xxx
index 263f826fe15f3f64969a9a89e7b7ccc5e7b0ad77..30f2ea471ac96a4dad4f0c6e633c2fa131a47193 100644 (file)
--- a/test/mail/0431.xxx
+++ b/test/mail/0431.xxx
@@ -5,9 +5,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for pre.xxx@a.b; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for pre.xxx@a.b; 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>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 MAIL FROM:<CALLER@myhost.test.ex>
 
 .
 MAIL FROM:<CALLER@myhost.test.ex>


@@ -17,8 +17,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbA-0005vi-00
        for pre.xxx@a.b; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbA-0005vi-00
        for pre.xxx@a.b; 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>
 Message-Id: <E10HmbA-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/0436.CALLER b/test/mail/0436.CALLER
index 71eedd979703c9bcb8b72b8f13b955be8e90d464..c531a4da11c4e64f718d6a00dc7e85c3ff8397a0 100644 (file)
--- a/test/mail/0436.CALLER
+++ b/test/mail/0436.CALLER
@@ -11,8 +11,8 @@ Envelope-to: a@d1.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
 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>
 Message-Id: <E10HmaX-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/0437.file b/test/mail/0437.file
index 4c0dd6c824650674e0a6f9cbd25f8fc6aa7bd295..eb79fa78977ce28e0e84e120fe49a32d81b410a7 100644 (file)
--- a/test/mail/0437.file
+++ b/test/mail/0437.file
@@ -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
        (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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 First message
 
 
 First message
 


@@ -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
        (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>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Second message
 
 
 Second message
 

diff --git a/test/mail/0444.CALLER b/test/mail/0444.CALLER
index 76b76de6b25182fbaccb5220d119f608c891a4e9..1e9c21103ee09bd6559ff7d75cfd3da9be185888 100644 (file)
--- a/test/mail/0444.CALLER
+++ b/test/mail/0444.CALLER
@@ -2,6 +2,8 @@ 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 CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>

 From: Mailer-Daemon@test.ex
 Reply-To: postmaster@test.ex
 To: CALLER@test.ex
 From: Mailer-Daemon@test.ex
 Reply-To: postmaster@test.ex
 To: CALLER@test.ex


@@ -9,9 +11,7 @@ Subject: Submission of mail from CALLER@test.ex directly to the XXX hosts
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
 References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 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>

 Sender: CALLER_NAME <CALLER@test.ex>
 Sender: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 You sent the message below from the host
 
 
 You sent the message below from the host
 


@@ -36,9 +36,9 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message.
 
 
 This is a test message.
 

diff --git a/test/mail/0444.userx b/test/mail/0444.userx
index 687b228a8f7f7cee99a6755bdaf336aa68eba64e..12690ffb349c6344b4c56cbd865add8de4020422 100644 (file)
--- a/test/mail/0444.userx
+++ b/test/mail/0444.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message.
 
 
 This is a test message.
 

diff --git a/test/mail/0446.userx b/test/mail/0446.userx
index 4aebdbe234758367b1ae5db771540356e4c474ba..69ee5075cda98f9d935175579f5ee632dd72f96e 100644 (file)
--- a/test/mail/0446.userx
+++ b/test/mail/0446.userx
@@ -3,11 +3,11 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>

 Received: the first received: line
 Received: the second received: line
 Received: the first received: line
 Received: the second received: line

-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 X-ACL: 3
 X-Router: 3
 
 X-ACL: 3
 X-Router: 3
 


@@ -17,11 +17,11 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>

 Received: the first received: line
 Received: the second received: line
 Received: the first received: line
 Received: the second received: line

-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 X-ACL: 3
 X-Router: 3
 
 X-ACL: 3
 X-Router: 3
 

diff --git a/test/mail/0449.userx b/test/mail/0449.userx
index 7976e948a22375da6ea4bdaa225f2ccdd3fa2a67..33fb1ad1301a92e060f3832619e55d4bc327f382 100644 (file)
--- a/test/mail/0449.userx
+++ b/test/mail/0449.userx
@@ -3,9 +3,9 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message 1
 
 
 Message 1
 

diff --git a/test/mail/0452.CALLER b/test/mail/0452.CALLER
index 298abf033e7dabf681f1a930014ac0712069893c..6c9f41736ad72fdcf26fe31350e043d0ab6c997a 100644 (file)
--- a/test/mail/0452.CALLER
+++ b/test/mail/0452.CALLER
@@ -2,6 +2,8 @@ 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 CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>

 To: CALLER@test.ex
 Subject: Auto generated
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
 To: CALLER@test.ex
 Subject: Auto generated
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>


@@ -11,9 +13,7 @@ h1: the first added header
 h2: the second added header
  continued on another line
 h3: the third added header
 h2: the second added header
  continued on another line
 h3: the third added header

-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is some body text
 
 
 This is some body text
 


@@ -21,13 +21,13 @@ 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@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex 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@myhost.test.ex>

 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
 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: <E10HmbA-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -44,10 +44,10 @@ Received: from CALLER by myhost.test.ex 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-fno: 2
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>

+fno: 2

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Another message 
 
 
 Another message 
 

diff --git a/test/mail/0452.userx b/test/mail/0452.userx
index 385e9ec18c160ca69412ac57fc6ccc1a5008c427..842ec54e74b02046eb40694d82f0b779af190725 100644 (file)
--- a/test/mail/0452.userx
+++ b/test/mail/0452.userx
@@ -3,10 +3,10 @@ Received: from CALLER by myhost.test.ex 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-fno: 1
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

+fno: 1

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a message.
 
 
 This is a message.
 

diff --git a/test/mail/0461.CALLER b/test/mail/0461.CALLER
index 7faa6251a17c228e3667745f6ee3e1baddbc4972..7ac07a53f6d92087a94da871eb099addcdac59ed 100644 (file)
--- a/test/mail/0461.CALLER
+++ b/test/mail/0461.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 10HmbB-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex 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@myhost.test.ex>

 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
 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: <E10HmbB-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -25,9 +25,9 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Short message
 
 
 Short message
 


@@ -35,13 +35,13 @@ 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@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex 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@myhost.test.ex>

 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
 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: <E10HmbD-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -58,9 +58,9 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Short message
 
 
 Short message
 


@@ -68,13 +68,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmbF-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex 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@myhost.test.ex>

 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
 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: <E10HmbF-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -91,9 +91,9 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Short message
 
 
 Short message
 

diff --git a/test/mail/0472.userz99 b/test/mail/0472.userz99
index ca8fa0d8a0511a6b1a4884e8d7549db3d948625a..193b36f9e06d6f67e008a9e3ee52654b60282a36 100644 (file)
--- a/test/mail/0472.userz99
+++ b/test/mail/0472.userz99
@@ -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 userz@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-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: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.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

 
 Testing
 
 
 Testing
 


@@ -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 userz@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-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: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Testing 2
 
 
 Testing 2
 

diff --git a/test/mail/0481.userx b/test/mail/0481.userx
index a9f142c3547bf3ffbdce5fe8b12be9e37e791add..990f05927e12efc6bcecb6e1e53ef3f442e7c163 100644 (file)
--- a/test/mail/0481.userx
+++ b/test/mail/0481.userx
@@ -3,10 +3,10 @@ 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
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Another: This is another header
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

+Another: This is another header

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 X-Was-Remove-Me: >this header is to be removed<
 
 
 X-Was-Remove-Me: >this header is to be removed<
 
 

diff --git a/test/mail/0487.userx b/test/mail/0487.userx
index 42d5c111acfbd0bab2975c3f9638b7ff358790d0..b7510c691a7c2e380d08f6e939cdb952e57a35d4 100644 (file)
--- a/test/mail/0487.userx
+++ b/test/mail/0487.userx
@@ -4,9 +4,9 @@ Received: from CALLER (helo=x.y)
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-From: unqualified
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

 Date: 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: unqualified

 
 Test message.
 
 
 Test message.
 

diff --git a/test/mail/0491.userx b/test/mail/0491.userx
index d03d18632052e0e71b928f451ba27c8f5513fd3e..404b65bac077efae8b83c9a1a3a0baca12deb6da 100644 (file)
--- a/test/mail/0491.userx
+++ b/test/mail/0491.userx
@@ -3,9 +3,9 @@ Received: from "abc@xyz" by myhost.test.ex with local (Exim x.yz)
        (envelope-from <"abc@xyz"@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <"abc@xyz"@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 <"abc@xyz"@myhost.test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <"abc@xyz"@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 From a.b@myhost.test.ex Tue Mar 02 09:44:33 1999
 
 
 From a.b@myhost.test.ex Tue Mar 02 09:44:33 1999


@@ -13,9 +13,9 @@ Received: from a.b by myhost.test.ex with local (Exim x.yz)
        (envelope-from <a.b@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <a.b@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 <a.b@myhost.test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <a.b@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 From ".a.b"@myhost.test.ex Tue Mar 02 09:44:33 1999
 
 
 From ".a.b"@myhost.test.ex Tue Mar 02 09:44:33 1999


@@ -23,9 +23,9 @@ Received: from ".a.b" by myhost.test.ex with local (Exim x.yz)
        (envelope-from <".a.b"@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <".a.b"@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 <".a.b"@myhost.test.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <".a.b"@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 From "a.b."@myhost.test.ex Tue Mar 02 09:44:33 1999
 
 
 From "a.b."@myhost.test.ex Tue Mar 02 09:44:33 1999


@@ -33,9 +33,9 @@ Received: from "a.b." by myhost.test.ex with local (Exim x.yz)
        (envelope-from <"a.b."@myhost.test.ex>)
        id 10HmbA-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <"a.b."@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>
 From: CALLER_NAME <"a.b."@myhost.test.ex>
 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <"a.b."@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 From "a\"b"@myhost.test.ex Tue Mar 02 09:44:33 1999
 
 
 From "a\"b"@myhost.test.ex Tue Mar 02 09:44:33 1999


@@ -43,9 +43,9 @@ Received: from "a\"b" by myhost.test.ex with local (Exim x.yz)
        (envelope-from <"a\"b"@myhost.test.ex>)
        id 10HmbB-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <"a\"b"@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: CALLER_NAME <"a\"b"@myhost.test.ex>
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <"a\"b"@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 From "abc@xyz"@myhost.test.ex Tue Mar 02 09:44:33 1999
 
 
 From "abc@xyz"@myhost.test.ex Tue Mar 02 09:44:33 1999


@@ -53,10 +53,10 @@ Received: from "abc@xyz" by myhost.test.ex with local (Exim x.yz)
        (envelope-from <"abc@xyz"@myhost.test.ex>)
        id 10HmbC-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <"abc@xyz"@myhost.test.ex>)
        id 10HmbC-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-From: x@y
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>

+From: x@y

 Sender: CALLER_NAME <"abc@xyz"@myhost.test.ex>
 Sender: CALLER_NAME <"abc@xyz"@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 From "abc%xyz"@myhost.test.ex Tue Mar 02 09:44:33 1999
 
 
 From "abc%xyz"@myhost.test.ex Tue Mar 02 09:44:33 1999


@@ -64,8 +64,8 @@ Received: from "abc@xyz" by myhost.test.ex with local (Exim x.yz)
        (envelope-from <"abc%xyz"@myhost.test.ex>)
        id 10HmbD-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <"abc%xyz"@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 <"abc%xyz"@myhost.test.ex>
 Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <"abc%xyz"@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0493.a b/test/mail/0493.a
index ad9fceaea64dc89907ace225498fd8d5e18aa5ef..a0d08aec7e8f8bec79858cfff59b7afeb7e9472e 100644 (file)
--- a/test/mail/0493.a
+++ b/test/mail/0493.a
@@ -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 a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.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@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.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

 To: 12345@some.domain.or.other, 54321@some.domain.or.other,
     12345@some.domain.or.other, 54321@some.domain.or.other,
     12345@some.domain.or.other, 54321@some.domain.or.other,
 To: 12345@some.domain.or.other, 54321@some.domain.or.other,
     12345@some.domain.or.other, 54321@some.domain.or.other,
     12345@some.domain.or.other, 54321@some.domain.or.other,

diff --git a/test/mail/0494.userx b/test/mail/0494.userx
index 4379cb298a479ee34b5127b474e5c8513feab3f0..5b6a1e0d84f0e609ec9b53fb11dd08475610e5f8 100644 (file)
--- a/test/mail/0494.userx
+++ b/test/mail/0494.userx
@@ -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 userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex 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@myhost.test.ex>

 To: userx@test.ex
 Subject: testing, testing
 In-Reply-To: <E10HmaX-0005vi-00@myhost.test.ex>
 References: <E10HmaX-0005vi-00@myhost.test.ex>
 Auto-Submitted: auto-replied
 To: userx@test.ex
 Subject: testing, testing
 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
 From: EXIMUSER@myhost.test.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0496.someone b/test/mail/0496.someone
index 49cda3694cc4b0ae79b64401193548471c13d56b..69e717a67d204027c098574f1ee6a78d0b779846 100644 (file)
--- a/test/mail/0496.someone
+++ b/test/mail/0496.someone
@@ -5,11 +5,11 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaX-0005vi-00
        for someone@el.se; Tue, 2 Mar 1999 09:44:33 +0000
 After-Received: some text
        id 10HmaX-0005vi-00
        for someone@el.se; Tue, 2 Mar 1999 09:44:33 +0000
 After-Received: some text

+Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

 From: some@ne
 To: someone@el.se
 From: some@ne
 To: someone@el.se

-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

 Sender: CALLER_NAME <CALLER@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 X-ACL-Warn: data1 data1
 X-ACL-Warn: data2 data2
 At-End: some text
 X-ACL-Warn: data1 data1
 X-ACL-Warn: data2 data2
 At-End: some text

diff --git a/test/mail/0500.userx b/test/mail/0500.userx
index 78312f0d1a1a622bbfb0365bea294f21823880e2..a6ea3a71104cf7375cbfc5b4ecfd3257ab8bdd02 100644 (file)
--- a/test/mail/0500.userx
+++ b/test/mail/0500.userx
@@ -3,10 +3,10 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <postmaster@y>)
        id 10HmaX-0005vi-00
        for userx@y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <postmaster@y>)
        id 10HmaX-0005vi-00
        for userx@y; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: testing
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

+Subject: testing

 From: postmaster@y
 From: postmaster@y

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 X-warning: this is a test warning (userx@y)
 
 
 X-warning: this is a test warning (userx@y)
 
 

diff --git a/test/mail/0503.userx b/test/mail/0503.userx
index afa0a578b15e7c620e0b21d438c539d6c8a626de..533eb1660a5e4094038440deb8421ab48bf4a98d 100644 (file)
--- a/test/mail/0503.userx
+++ b/test/mail/0503.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
        (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>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test 1
 
 
 Test 1
 

diff --git a/test/mail/0508.postmaster b/test/mail/0508.postmaster
index d2ead9f04f93570d48f784f275b65ee8614d432e..ff04b8ef06f6322af23572816f0d495a70b4aec6 100644 (file)
--- a/test/mail/0508.postmaster
+++ b/test/mail/0508.postmaster
@@ -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 postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        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@myhost.test.ex>

 X-Failed-Recipients: userx@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: postmaster@test.ex
 Subject: Mail delivery failed
 X-Failed-Recipients: userx@myhost.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: postmaster@test.ex
 Subject: Mail delivery failed

-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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -35,8 +35,8 @@ Return-path: <>
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        id 10HmaX-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        id 10HmaX-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

 Date: 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>

 
 This is a test message
 
 
 This is a test message
 

diff --git a/test/mail/0514.userx b/test/mail/0514.userx
index 5f22df611865e9d96303a7bb5fb5d2f381c2edfd..bb31ef3afa14c42dae608cbbdd8b2dc28a131032 100644 (file)
--- a/test/mail/0514.userx
+++ b/test/mail/0514.userx
@@ -3,9 +3,9 @@ Received: from "spaced user" by myhost.test.ex with local (Exim x.yz)
        (envelope-from <"spaced user"@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <"spaced user"@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 <"spaced user"@myhost.test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <"spaced user"@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Testing
 
 
 Testing
 

diff --git a/test/mail/0517.userx b/test/mail/0517.userx
index b9b1a1bc31df3f17160f46743d7dbb06bf3b2a74..6783f7d0409848c61593f42fda847c1e4f929135 100644 (file)
--- a/test/mail/0517.userx
+++ b/test/mail/0517.userx
@@ -3,8 +3,8 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@dom.com; 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>
 Message-Id: <E10HmaX-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/0522.CALLER b/test/mail/0522.CALLER
index 09386c45644ab313e0ae8c28e0260a85cf4d3b7b..01ff80221b728f8bbcb7742cb56abd3fb48a4221 100644 (file)
--- a/test/mail/0522.CALLER
+++ b/test/mail/0522.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@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex 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@myhost.test.ex>

 X-Failed-Recipients: nofilter@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
 X-Failed-Recipients: nofilter@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@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -25,22 +25,22 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for nofilter@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for nofilter@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@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 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 myhost.test.ex with local (Exim x.yz)
        id 10HmbA-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 
 
 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@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: filter@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
 X-Failed-Recipients: filter@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@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -57,8 +57,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for filter@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for filter@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@test.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0523.userx b/test/mail/0523.userx
index 854cab5c085dcb4c9249411f4fe54dbf3f08a90b..8da8da3206e1d01b5e8f8accf5ab8d2fb1ae540d 100644 (file)
--- a/test/mail/0523.userx
+++ b/test/mail/0523.userx
@@ -6,9 +6,9 @@ Envelope-to: four@test.ex,
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 Delivered-To: one@test.ex
 Delivered-To: userx@test.ex
 
 Delivered-To: one@test.ex
 Delivered-To: userx@test.ex
 

diff --git a/test/mail/0530.CALLER b/test/mail/0530.CALLER
index d07382180ef7fbf6c3d40a19ab2478e7a226cf7f..278f3ab2f08153d26282eb1835812d153c4f374d 100644 (file)
--- a/test/mail/0530.CALLER
+++ b/test/mail/0530.CALLER
@@ -2,14 +2,14 @@ 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 CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER 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
 Subject: Re: Message-id, no References, no In-Reply-to
 In-Reply-To: <m1@b>
 References: <m1@b>
 Auto-Submitted: auto-replied
 To: CALLER@myhost.test.ex
 Subject: Re: Message-id, no References, no In-Reply-to
 In-Reply-To: <m1@b>
 References: <m1@b>
 Auto-Submitted: auto-replied

-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is the text of the autoreply.
 
 
 This is the text of the autoreply.
 


@@ -17,14 +17,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER 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
 Received: from CALLER 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>

 To: CALLER@myhost.test.ex
 Subject: Re: Message-id, no References, In-Reply-to
 In-Reply-To: <m1@b>
 References: <i1@b> <m1@b>
 Auto-Submitted: auto-replied
 To: CALLER@myhost.test.ex
 Subject: Re: Message-id, no References, In-Reply-to
 In-Reply-To: <m1@b>
 References: <i1@b> <m1@b>
 Auto-Submitted: auto-replied

-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is the text of the autoreply.
 
 
 This is the text of the autoreply.
 


@@ -32,14 +32,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        id 10HmbC-0005vi-00
        for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        id 10HmbC-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: <E10HmbC-0005vi-00@myhost.test.ex>

 To: CALLER@myhost.test.ex
 Subject: Re: Message-id, References (1), In-Reply-to
 In-Reply-To: <m1@b>
 References: <r1@b> <m1@b>
 Auto-Submitted: auto-replied
 To: CALLER@myhost.test.ex
 Subject: Re: Message-id, References (1), In-Reply-to
 In-Reply-To: <m1@b>
 References: <r1@b> <m1@b>
 Auto-Submitted: auto-replied

-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is the text of the autoreply.
 
 
 This is the text of the autoreply.
 


@@ -47,14 +47,14 @@ 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 CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        id 10HmbE-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: <E10HmbE-0005vi-00@myhost.test.ex>

 To: CALLER@myhost.test.ex
 Subject: Re: Message-id, References (5), no In-Reply-to
 In-Reply-To: <m1@b>
 References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b> <m1@b>
 Auto-Submitted: auto-replied
 To: CALLER@myhost.test.ex
 Subject: Re: Message-id, References (5), no In-Reply-to
 In-Reply-To: <m1@b>
 References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b> <m1@b>
 Auto-Submitted: auto-replied

-Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is the text of the autoreply.
 
 
 This is the text of the autoreply.
 


@@ -62,14 +62,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        id 10HmbG-0005vi-00
        for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        id 10HmbG-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: <E10HmbG-0005vi-00@myhost.test.ex>

 To: CALLER@myhost.test.ex
 Subject: Re: Message-id, References (15), In-Reply-to
 In-Reply-To: <m1@b>
 References: <r1@b> <r5@b> <r6@b> <r7@b> <r8@b> <r9@b> <r10@b> <r11@b> <r12@b> <r13@b> <r14@b> <r15@b> <m1@b>
 Auto-Submitted: auto-replied
 To: CALLER@myhost.test.ex
 Subject: Re: Message-id, References (15), In-Reply-to
 In-Reply-To: <m1@b>
 References: <r1@b> <r5@b> <r6@b> <r7@b> <r8@b> <r9@b> <r10@b> <r11@b> <r12@b> <r13@b> <r14@b> <r15@b> <m1@b>
 Auto-Submitted: auto-replied

-Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is the text of the autoreply.
 
 
 This is the text of the autoreply.
 


@@ -77,12 +77,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        id 10HmbI-0005vi-00
        for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        id 10HmbI-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: <E10HmbI-0005vi-00@myhost.test.ex>

 To: CALLER@myhost.test.ex
 Subject: Re: no Message-id, no References, no In-Reply-to
 Auto-Submitted: auto-replied
 To: CALLER@myhost.test.ex
 Subject: Re: no Message-id, no References, no In-Reply-to
 Auto-Submitted: auto-replied

-Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is the text of the autoreply.
 
 
 This is the text of the autoreply.
 


@@ -90,13 +90,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        id 10HmbK-0005vi-00
        for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        id 10HmbK-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: <E10HmbK-0005vi-00@myhost.test.ex>

 To: CALLER@myhost.test.ex
 Subject: Re: no Message-id, no References, In-Reply-to
 References: <i1@b>
 Auto-Submitted: auto-replied
 To: CALLER@myhost.test.ex
 Subject: Re: no Message-id, no References, In-Reply-to
 References: <i1@b>
 Auto-Submitted: auto-replied

-Message-Id: <E10HmbK-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is the text of the autoreply.
 
 
 This is the text of the autoreply.
 


@@ -104,13 +104,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        id 10HmbM-0005vi-00
        for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        id 10HmbM-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: <E10HmbM-0005vi-00@myhost.test.ex>

 To: CALLER@myhost.test.ex
 Subject: Re: no Message-id, References (1), In-Reply-to
 References: <r1@b>
 Auto-Submitted: auto-replied
 To: CALLER@myhost.test.ex
 Subject: Re: no Message-id, References (1), In-Reply-to
 References: <r1@b>
 Auto-Submitted: auto-replied

-Message-Id: <E10HmbM-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is the text of the autoreply.
 
 
 This is the text of the autoreply.
 


@@ -118,13 +118,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        id 10HmbO-0005vi-00
        for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        id 10HmbO-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: <E10HmbO-0005vi-00@myhost.test.ex>

 To: CALLER@myhost.test.ex
 Subject: Re: no Message-id, References (5), no In-Reply-to
 References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b>
 Auto-Submitted: auto-replied
 To: CALLER@myhost.test.ex
 Subject: Re: no Message-id, References (5), no In-Reply-to
 References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b>
 Auto-Submitted: auto-replied

-Message-Id: <E10HmbO-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is the text of the autoreply.
 
 
 This is the text of the autoreply.
 


@@ -132,13 +132,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        id 10HmbQ-0005vi-00
        for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        id 10HmbQ-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: <E10HmbQ-0005vi-00@myhost.test.ex>

 To: CALLER@myhost.test.ex
 Subject: Re: no Message-id, References (15), In-Reply-to
 References: <r1@b> <r5@b> <r6@b> <r7@b> <r8@b> <r9@b> <r10@b> <r11@b> <r12@b> <r13@b> <r14@b> <r15@b>
 Auto-Submitted: auto-replied
 To: CALLER@myhost.test.ex
 Subject: Re: no Message-id, References (15), In-Reply-to
 References: <r1@b> <r5@b> <r6@b> <r7@b> <r8@b> <r9@b> <r10@b> <r11@b> <r12@b> <r13@b> <r14@b> <r15@b>
 Auto-Submitted: auto-replied

-Message-Id: <E10HmbQ-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is the text of the autoreply.
 
 
 This is the text of the autoreply.
 

diff --git a/test/mail/0531.CALLER b/test/mail/0531.CALLER
index a35a78259b3576c424f9780243c3421e9ae8b125..98e03c6c6d1991be176b4e077caf7c8023f485ed 100644 (file)
--- a/test/mail/0531.CALLER
+++ b/test/mail/0531.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
 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: userx@test.ex
 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
 X-Failed-Recipients: userx@test.ex
 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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -24,9 +24,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
 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>
 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.
 
 
 This is a test message.
 


@@ -34,13 +34,13 @@ 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
 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: userx@retry.test.ex
 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
 X-Failed-Recipients: userx@retry.test.ex
 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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -57,9 +57,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@retry.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for userx@retry.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>
 Message-Id: <E10HmaZ-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.
 
 
 This is a test message.
 


@@ -67,13 +67,13 @@ 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 CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmbC-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: <E10HmbC-0005vi-00@myhost.test.ex>

 X-Failed-Recipients: userx@test.ex
 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
 X-Failed-Recipients: userx@test.ex
 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: <E10HmbC-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -91,9 +91,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@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.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.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 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.
 
 
 This is a test message.
 

diff --git a/test/mail/0532.rcptok b/test/mail/0532.rcptok
index e669ef77733920a6cc983a21f1229d2ca09a0762..4685a414f62a47a2ec126adf8defbbdcf4d1680c 100644 (file)
--- a/test/mail/0532.rcptok
+++ b/test/mail/0532.rcptok
@@ -3,10 +3,10 @@ Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <mailok@test.ex>)
        id 10HmaX-0005vi-00
        for rcptok@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <mailok@test.ex>)
        id 10HmaX-0005vi-00
        for rcptok@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-cond: accept
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

+cond: accept

 From: mailok@test.ex
 From: mailok@test.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 MAIL: one
 MAIL: two
 MAIL: three
 MAIL: one
 MAIL: two
 MAIL: three


@@ -28,9 +28,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for rcptok@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for rcptok@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@test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 NOTSMTP: rcptok@test.ex
 
 Test non-SMTP message.
 NOTSMTP: rcptok@test.ex
 
 Test non-SMTP message.

diff --git a/test/mail/0533.mbox b/test/mail/0533.mbox
index 26716f507fffb37e6b177b21a75fc5a98474231d..7b561cbfdf86486121221e59a55cb3fdb7a02682 100644 (file)
--- a/test/mail/0533.mbox
+++ b/test/mail/0533.mbox
@@ -4,9 +4,9 @@ Envelope-to: file-usery=mbox@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
 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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 A test message.
 
 
 A test message.
 

diff --git a/test/mail/0533.mbox2 b/test/mail/0533.mbox2
index 4d2c7548bf03b5ec1ac1144c352de4abfe675a00..f7ae33bfec9d99ff245c1b3d68cd67acd63b4a9e 100644 (file)
--- a/test/mail/0533.mbox2
+++ b/test/mail/0533.mbox2
@@ -4,9 +4,9 @@ Envelope-to: file-usera=mbox2@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
 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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 A test message.
 
 
 A test message.
 

diff --git a/test/mail/0535.userx b/test/mail/0535.userx
index e3994508e4b786b214776519be06846a602d8c88..62f708f0334f09392067d0e46f34860f04265a2a 100644 (file)
--- a/test/mail/0535.userx
+++ b/test/mail/0535.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
        (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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 No headers supplied.
 
 
 No headers supplied.
 


@@ -23,9 +23,9 @@ Received: from CALLER by myhost.test.ex with local-bsmtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmaZ-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <x@y>)
        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: x@y
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: x@y

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 No headers supplied.
 
 
 No headers supplied.
 

diff --git a/test/mail/0536.oksender b/test/mail/0536.oksender
index 9a3e0ea343ea9353e303ab88ad54c523f29d5601..e92c7c60689456cbb2f09c289bcd2c88d7f69db4 100644 (file)
--- a/test/mail/0536.oksender
+++ b/test/mail/0536.oksender
@@ -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 10HmbC-0005vi-00
        for oksender@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmbC-0005vi-00
        for oksender@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>

 X-Failed-Recipients: user22@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: oksender@test.ex
 Subject: Mail delivery failed: returning message to sender
 X-Failed-Recipients: user22@test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: oksender@test.ex
 Subject: Mail delivery failed: returning message to sender

-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This message was created automatically by mail delivery software.
 
 
 This message was created automatically by mail delivery software.
 


@@ -25,8 +25,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <oksender@test.ex>)
        id 10HmbB-0005vi-00
        for user22@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <oksender@test.ex>)
        id 10HmbB-0005vi-00
        for user22@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: oksender@test.ex
 Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 From: oksender@test.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0536.user1 b/test/mail/0536.user1
index b918842f98735584c52bf97a115db3e8a9a5e0b4..f8f09825ba016f7e8a3fa8600a1ce04551e7086b 100644 (file)
--- a/test/mail/0536.user1
+++ b/test/mail/0536.user1
@@ -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 user1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmaZ-0005vi-00
        for user1@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: user1@test.ex
 Subject: Mail failure - rejected by local scanning code
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: user1@test.ex
 Subject: Mail failure - rejected by local scanning code

-Message-Id: <E10HmaZ-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:
 
 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,8 +20,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <user1@test.ex>)
        id 10HmaX-0005vi-00
        for user1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <user1@test.ex>)
        id 10HmaX-0005vi-00
        for user1@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: user1@test.ex
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: user1@test.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0536.user2 b/test/mail/0536.user2
index 64bd15814d1664c89f208a943c44753331bf40ed..8ff7b6f3a073f2fba0ce23e8822206aa07457fdf 100644 (file)
--- a/test/mail/0536.user2
+++ b/test/mail/0536.user2
@@ -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 10HmbA-0005vi-00
        for user2@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
        id 10HmbA-0005vi-00
        for user2@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: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: user2@test.ex
 Subject: Mail failure - rejected by local scanning code
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: user2@test.ex
 Subject: Mail failure - rejected by local scanning code

-Message-Id: <E10HmbA-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:
 
 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,8 +20,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <user2@test.ex>)
        id 10HmaY-0005vi-00
        for user1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <user2@test.ex>)
        id 10HmaY-0005vi-00
        for user1@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: user2@test.ex
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: user2@test.ex

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/0551.userx b/test/mail/0551.userx
index 01ca394c05d1b7677dab16a0c9c3c8c1ecd90557..7e448b25b0725f50ea4b1eeaabfaf93ef30be14f 100644 (file)
--- a/test/mail/0551.userx
+++ b/test/mail/0551.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 (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 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>
 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
 
 
 Message 1
 


@@ -12,9 +12,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 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.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@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message 2
 
 
 Message 2
 


@@ -23,9 +23,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@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.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@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message 3
 
 
 Message 3
 

diff --git a/test/mail/0551.usery b/test/mail/0551.usery
index e4d855b81b53a31a799ab64d2bd266a330f45214..7f822888a3da3c82ad4fc2934e1467dadf054e0d 100644 (file)
--- a/test/mail/0551.usery
+++ b/test/mail/0551.usery
@@ -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
 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>
 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
 
 
 Message 1
 

diff --git a/test/mail/0551.userz b/test/mail/0551.userz
index 29b2f0da756b79bb04efee362c0d443700f782a6..760f2665bba33cda24cf154e16897f9a16128a90 100644 (file)
--- a/test/mail/0551.userz
+++ b/test/mail/0551.userz
@@ -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 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.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@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message 2
 
 
 Message 2
 

diff --git a/test/mail/2008.CALLER b/test/mail/2008.CALLER
index 886e3e63ff36e3f4d0d1342167619522ede38e92..2bb5aa0a25b93a3eb81c8c05625b7b77fccbd816 100644 (file)
--- a/test/mail/2008.CALLER
+++ b/test/mail/2008.CALLER
@@ -9,9 +9,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.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@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.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

 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message. Contains FF: ÿ
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message. Contains FF: ÿ


@@ -25,9 +25,9 @@ Received: from [127.0.0.1] (helo=helo.data.changed)
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.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@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message to two different hosts
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message to two different hosts

diff --git a/test/mail/2008.abcd b/test/mail/2008.abcd
index bfa5813486003f9c57ec8d204ef5c9fcecb3d705..8b37b136e59d4cd4676fe208e14c25f322950dd4 100644 (file)
--- a/test/mail/2008.abcd
+++ b/test/mail/2008.abcd
@@ -8,9 +8,9 @@ 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 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.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@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message to two different hosts
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message to two different hosts

diff --git a/test/mail/2008.xyz b/test/mail/2008.xyz
index 598f07f337f80bdc104454f9cf2d6cac8641223e..28a57acd28dc2b79f7ba405d8fd686291370bd21 100644 (file)
--- a/test/mail/2008.xyz
+++ b/test/mail/2008.xyz
@@ -7,9 +7,9 @@ Received: from [127.0.0.1] (helo=helo.data.changed)
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.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@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message to two different hosts
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message to two different hosts

diff --git a/test/mail/2013.userx b/test/mail/2013.userx
index ab47286c44bdf33e41520c1f806deeb76ef72f8e..395b1210968d5d5c966f6be5d91736f61ecaa95e 100644 (file)
--- a/test/mail/2013.userx
+++ b/test/mail/2013.userx
@@ -9,9 +9,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
        (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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 1
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 1


@@ -27,9 +27,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@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.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@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 2
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 2

diff --git a/test/mail/2017.userx b/test/mail/2017.userx
index 5b0d85f90b89bcf91811de094866471819446ec5..4aeb954fd9b81315619c2c6d67654fce2e0d44d3 100644 (file)
--- a/test/mail/2017.userx
+++ b/test/mail/2017.userx
@@ -9,9 +9,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
        (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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 1
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 1


@@ -27,9 +27,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@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.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@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 2
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 2

diff --git a/test/mail/2027.userx b/test/mail/2027.userx
index 9d1a54a7575b53aaa26ad3f208e59eb2d2f68782..1c3526c43eda69d276f416c09a891fd0cde11a28 100644 (file)
--- a/test/mail/2027.userx
+++ b/test/mail/2027.userx
@@ -9,9 +9,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
        (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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message

diff --git a/test/mail/2027.usery b/test/mail/2027.usery
index e76df9b2fbe3c8462223af1c2c67b627fe900cc7..56e989c4e957a4647079b6eddcaf4747d5de114a 100644 (file)
--- a/test/mail/2027.usery
+++ b/test/mail/2027.usery
@@ -8,9 +8,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.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@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 TLS: cipher= peerdn=
 
 Test message
 TLS: cipher= peerdn=
 
 Test message

diff --git a/test/mail/2600.userx b/test/mail/2600.userx
index 3e636bdb388f5f9ec9b4e3cb4bbbb14e18243a56..e81b64d21c77f9ab4e9d2321dd51ec85c6b8f50f 100644 (file)
--- a/test/mail/2600.userx
+++ b/test/mail/2600.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
        (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>
 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
 
 
 Test message
 

diff --git a/test/mail/3403.userx b/test/mail/3403.userx
index d8a0676d68d532aa556a6c6bd6652a2cc94a8989..11e00c316cf67e1d34c0019a64ca455d149f20d3 100644 (file)
--- a/test/mail/3403.userx
+++ b/test/mail/3403.userx
@@ -4,9 +4,9 @@ Received: from CALLER (helo=testing.ex)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 aid: userx
 
 Test data
 aid: userx
 
 Test data

diff --git a/test/mail/3451.userx b/test/mail/3451.userx
index 713abc882630a118d9b3dcfb4953a5be2c7c72ed..72cf09efe2a1fc56e783c5db31ab87904949a7dd 100644 (file)
--- a/test/mail/3451.userx
+++ b/test/mail/3451.userx
@@ -9,9 +9,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
        (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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 1
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 1


@@ -27,9 +27,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@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.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@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 2
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 2

diff --git a/test/mail/3452.userx b/test/mail/3452.userx
index 713abc882630a118d9b3dcfb4953a5be2c7c72ed..72cf09efe2a1fc56e783c5db31ab87904949a7dd 100644 (file)
--- a/test/mail/3452.userx
+++ b/test/mail/3452.userx
@@ -9,9 +9,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
        (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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 1
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 1


@@ -27,9 +27,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@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.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@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 2
 TLS: cipher=TLS-1.0:RSA_AES_256_CBC_SHA1:32 peerdn=
 
 Test message 2

diff --git a/test/mail/5000.new/1.myhost.test.ex b/test/mail/5000.new/1.myhost.test.ex
index 51712138907c50323746c4a96adae6199113463f..8248ae7d10d51a4eaebfc8c77886fcee7458846c 100644 (file)
--- a/test/mail/5000.new/1.myhost.test.ex
+++ b/test/mail/5000.new/1.myhost.test.ex
@@ -2,9 +2,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
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-maildir:maildir_
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>

+maildir:maildir_

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message
 
 This is a test message

diff --git a/test/mail/5000.new/2.myhost.test.ex b/test/mail/5000.new/2.myhost.test.ex
index 1b5b064983009a5cfd56427bd7a47d88a6dd1070..9ca1547b918a3e2c99a21b4148a2cc618a77d687 100644 (file)
--- a/test/mail/5000.new/2.myhost.test.ex
+++ b/test/mail/5000.new/2.myhost.test.ex
@@ -2,10 +2,10 @@ 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
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-maildir:maildir_
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>

+maildir:maildir_

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

diff --git a/test/mail/5000.new/3.myhost.test.ex:S370 b/test/mail/5000.new/3.myhost.test.ex:S370
index 7ea68ff5a6282b7c5962a9be24ab812705906d38..4512907d1841c3b3c44f01e0a7540e1744d3a659 100644 (file)
--- a/test/mail/5000.new/3.myhost.test.ex:S370
+++ b/test/mail/5000.new/3.myhost.test.ex:S370
@@ -3,10 +3,10 @@ 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
        (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>

 maildir:maildir_tagged_
 tag:Ssss
 maildir:maildir_tagged_
 tag:Ssss

-Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message
 
 This is a test message

diff --git a/test/mail/5000.new/4.myhost.test.ex,S=370 b/test/mail/5000.new/4.myhost.test.ex,S=370
index ed38791527e583c3fd239c20a20aac91a710ce18..d84c6e62e99d021fbb92d12a23c878e164d56c02 100644 (file)
--- a/test/mail/5000.new/4.myhost.test.ex,S=370
+++ b/test/mail/5000.new/4.myhost.test.ex,S=370
@@ -3,10 +3,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbC-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        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>

 maildir:maildir_tagged_
 tag:,S=sss
 maildir:maildir_tagged_
 tag:,S=sss

-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message
 
 This is a test message

diff --git a/test/mail/5000.new/5.myhost.test.ex b/test/mail/5000.new/5.myhost.test.ex
index 054bf9048a235ebcfe8e34ade0d15b36f5819189..4430aa64c87022c9aff88f16248d010bbf267da6 100644 (file)
--- a/test/mail/5000.new/5.myhost.test.ex
+++ b/test/mail/5000.new/5.myhost.test.ex
@@ -3,10 +3,10 @@ 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
        (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>

 maildir:maildir_tagged_
 tag:${if eq{0}{1}{rhubarb}fail}
 maildir:maildir_tagged_
 tag:${if eq{0}{1}{rhubarb}fail}

-Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message
 
 This is a test message

diff --git a/test/mail/5000.new/6.myhost.test.ex b/test/mail/5000.new/6.myhost.test.ex
index df71e1788c8fa4995deb8e0cab90ab86650c0e25..77f583f1819237e4829ecdbfa6ad9dd16fa3d777 100644 (file)
--- a/test/mail/5000.new/6.myhost.test.ex
+++ b/test/mail/5000.new/6.myhost.test.ex
@@ -3,6 +3,8 @@ 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
        (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>

 maildir:maildir_tagged_
 tag:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 maildir:maildir_tagged_
 tag:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa


@@ -10,8 +12,6 @@ tag:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
     aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

-Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message
 
 This is a test message

diff --git a/test/mail/5000.new/7.myhost.test.ex,S=10694953:2,S b/test/mail/5000.new/7.myhost.test.ex,S=10694953:2,S
index be53589ee747c95ffb393760d896c9696ebab36a..861a2d61d325fd8b2fcb846c6dd1adaaf1181e8c 100644 (file)
--- a/test/mail/5000.new/7.myhost.test.ex,S=10694953:2,S
+++ b/test/mail/5000.new/7.myhost.test.ex,S=10694953:2,S
@@ -3,9 +3,9 @@ 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
        (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>

 maildir:maildir_taggedX_
 tag:,S=sss:2,S
 maildir:maildir_taggedX_
 tag:,S=sss:2,S

-Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 

diff --git a/test/mail/5002.new/1.myhost.test.ex b/test/mail/5002.new/1.myhost.test.ex
index 4b8954864c0e1e568da663a433e727af89156e67..b212d52da06c96b55157fb52108c4e758a4a0c17 100644 (file)
--- a/test/mail/5002.new/1.myhost.test.ex
+++ b/test/mail/5002.new/1.myhost.test.ex
@@ -2,9 +2,9 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a message of a reasonable size. Fifty here.
 This is a message of a reasonable size. Fifty here.
 
 This is a message of a reasonable size. Fifty here.
 This is a message of a reasonable size. Fifty here.

diff --git a/test/mail/5004.new/1.mail.test.ex b/test/mail/5004.new/1.mail.test.ex
index 88be1450461e6d16f1fba64a6f2d8ddf4027c45b..9685588cd7e4a2ee6cf1737cada47ff1d0512577 100644 (file)
--- a/test/mail/5004.new/1.mail.test.ex
+++ b/test/mail/5004.new/1.mail.test.ex
@@ -2,8 +2,8 @@ Received: from CALLER by mail.test.ex 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
        (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@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Testing
 
 Testing

diff --git a/test/mail/5005.nofile/new/1.myhost.test.ex b/test/mail/5005.nofile/new/1.myhost.test.ex
index 5da3db575d628e3932728522192c5fa24fd8f4f4..001bbcf77e59339bb3b53082a7c12356d932f906 100644 (file)
--- a/test/mail/5005.nofile/new/1.myhost.test.ex
+++ b/test/mail/5005.nofile/new/1.myhost.test.ex
@@ -2,8 +2,8 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for nofile@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for nofile@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@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message for nofile
 
 Message for nofile

diff --git a/test/mail/5005.userx/new/2.myhost.test.ex b/test/mail/5005.userx/new/2.myhost.test.ex
index dcb7049b8b361893567539c149d35433d1b0e1cd..0edfe533ce2e0bf8bcc87433ed3884cb5be5bfc5 100644 (file)
--- a/test/mail/5005.userx/new/2.myhost.test.ex
+++ b/test/mail/5005.userx/new/2.myhost.test.ex
@@ -2,8 +2,8 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Short message
 
 Short message

diff --git a/test/mail/5006.userx/new/1.myhost.test.ex b/test/mail/5006.userx/new/1.myhost.test.ex
index 4db91ee5ae250dff4e59f762cf8d74d1f859a568..d9a403d25ca646b92cb932baec11bdd79d377293 100644 (file)
--- a/test/mail/5006.userx/new/1.myhost.test.ex
+++ b/test/mail/5006.userx/new/1.myhost.test.ex
@@ -2,8 +2,8 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Short message
 
 Short message

diff --git a/test/mail/5007.userx/new/1.myhost.test.ex b/test/mail/5007.userx/new/1.myhost.test.ex
index c077e2b7e94525ee5d276c6cdfc3826d377db5ad..e33e57fdbb173bbb43850702d358b9d444bc82bb 100644 (file)
--- a/test/mail/5007.userx/new/1.myhost.test.ex
+++ b/test/mail/5007.userx/new/1.myhost.test.ex
@@ -2,8 +2,8 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message
 
 Test message

diff --git a/test/mail/5050.userx b/test/mail/5050.userx
index 2b5ed9885d9df5c835bbd6aae96a09799fed06f9..2131c64978d7be326adcd9bd3d81750fe80b6ae1 100644 (file)
--- a/test/mail/5050.userx
+++ b/test/mail/5050.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
        (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>
 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.
 
 
 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
        (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>
 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.
 
 
 Second test message, no prefix.
 

diff --git a/test/mail/5050.usery b/test/mail/5050.usery
index fd87afe8a28bdd80db2cd17abe6e89d1cccdf1ca..32d932a83564c294b9588c8aad629ca0d0887507 100644 (file)
--- a/test/mail/5050.usery
+++ b/test/mail/5050.usery
@@ -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 usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-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: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaZ-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.
 
 
 Second test message, no prefix.
 

diff --git a/test/mail/5050.userz b/test/mail/5050.userz
index 75b251f9f031bc5891e216e568423803a716ca02..59b20331931272cf9507f4a7c6318a574797f7a9 100644 (file)
--- a/test/mail/5050.userz
+++ b/test/mail/5050.userz
@@ -6,9 +6,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
        (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>
 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.
 
 
 Second 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>)\r
        id 10HmbB-0005vi-00\r
        for mbx_userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000\r
        (envelope-from <CALLER@test.ex>)\r
        id 10HmbB-0005vi-00\r
        for mbx_userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000\r

+Date: Tue, 2 Mar 1999 09:44:33 +0000\r

 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>\r
 From: CALLER_NAME <CALLER@test.ex>\r
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>\r
 From: CALLER_NAME <CALLER@test.ex>\r

-Date: Tue, 2 Mar 1999 09:44:33 +0000\r

 \r
 Test message with mbx_ prefix\r
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 \r
 Test message with mbx_ prefix\r
 From CALLER@test.ex Tue Mar 02 09:44:33 1999


@@ -33,9 +33,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
        (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>
 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.
 
 
 Second test message, no prefix.
 

diff --git a/test/mail/5101.copied b/test/mail/5101.copied
index 4704c33ff013a32df7b3d6564719f78ac09d10cd..f1b3d8e649d375230e8f047ccae72071be178ace 100644 (file)
--- a/test/mail/5101.copied
+++ b/test/mail/5101.copied
@@ -4,10 +4,10 @@ Envelope-to: userx@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
 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

-mailbox: copied
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

+mailbox: copied

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 X-Recipient: local_part= domain=myhost.test.ex
 X-Home: /usr
 
 X-Recipient: local_part= domain=myhost.test.ex
 X-Home: /usr
 


@@ -18,13 +18,13 @@ Envelope-to: CALLER@myhost.test.ex
 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
 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: jack@myhost.test.ex
 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
 X-Failed-Recipients: jack@myhost.test.ex
 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

 X-Recipient: local_part=CALLER domain=myhost.test.ex
 X-Home: 
 
 X-Recipient: local_part=CALLER domain=myhost.test.ex
 X-Home: 
 


@@ -42,10 +42,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 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 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

-mailbox: copied
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

+mailbox: copied

 From: CALLER_NAME <CALLER@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message.
 
 
 This is a test message.
 


@@ -54,13 +54,13 @@ Envelope-to: CALLER@myhost.test.ex
 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
 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: jack@myhost.test.ex
 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
 X-Failed-Recipients: jack@myhost.test.ex
 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

 X-Recipient: local_part=CALLER domain=myhost.test.ex
 X-Home: 
 
 X-Recipient: local_part=CALLER domain=myhost.test.ex
 X-Home: 
 


@@ -78,9 +78,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
 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>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is another test message.
 
 
 This is another test message.
 

diff --git a/test/mail/5200.postmaster b/test/mail/5200.postmaster
index 0068db5da1bc319bf0b68dbfa5d0182bc802351f..6617c7b0c6274bfae8966507314a0d6baa97e3df 100644 (file)
--- a/test/mail/5200.postmaster
+++ b/test/mail/5200.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 10HmaY-0005vi-00
        for postmaster@test.ex; 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 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>

 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: Message frozen
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: Message frozen

-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message 10HmaX-0005vi-00 has been frozen.
 The sender is <CALLER@test.ex>.
 
 Message 10HmaX-0005vi-00 has been frozen.
 The sender is <CALLER@test.ex>.

diff --git a/test/mail/5203.userx b/test/mail/5203.userx
index 1cb2875ec753219634e010d34e8e8e6e49bcee21..2dca8a448d3517ac7bc35bffba56d769b6b06d50 100644 (file)
--- a/test/mail/5203.userx
+++ b/test/mail/5203.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@remote.domain; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@remote.domain; 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>
 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   0 opt=0 STATUS   1 opt=0 STATUS   2 opt=0 STATUS 
 
 Test message
 max fd = dddd   0 opt=0 STATUS   1 opt=0 STATUS   2 opt=0 STATUS 

diff --git a/test/mail/5204.CALLER b/test/mail/5204.CALLER
index d468c4a9d34306ded8664431ea651b18c1f01f68..2dfc489525034b8281ca43ece3c8cfc0d877f132 100644 (file)
--- a/test/mail/5204.CALLER
+++ b/test/mail/5204.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
 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: "FAIL cannot route this one (FAIL)"@some.host
 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
 X-Failed-Recipients: "FAIL cannot route this one (FAIL)"@some.host
 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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -25,9 +25,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for "FAIL cannot route this one (FAIL)"@some.host; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for "FAIL cannot route this one (FAIL)"@some.host; 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>
 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
 
 
 Test message
 

diff --git a/test/mail/5207.qpgm b/test/mail/5207.qpgm
index da024f7a821927ebfc41ecb2a642c35b50e7ab79..7bf586034b7c8839ee68431a454a2818895ed940 100644 (file)
--- a/test/mail/5207.qpgm
+++ b/test/mail/5207.qpgm
@@ -2,17 +2,17 @@ From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 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
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 
 

diff --git a/test/mail/9001.CALLER b/test/mail/9001.CALLER
index 749ea8a4332df48b34d4aaeb0226f493f461a070..a07de714ae5069985942e7281bea0fb111e07cee 100644 (file)
--- a/test/mail/9001.CALLER
+++ b/test/mail/9001.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
 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: userx@myhost.test.ex
 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
 X-Failed-Recipients: userx@myhost.test.ex
 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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -25,8 +25,8 @@ 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
        (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>
 Message-Id: <E10HmaX-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/rejectlog/0021 b/test/rejectlog/0021
index edfe63fe94c32d310c8f59a9d5f6c14ff5005b84..04c1f3a94796fbaa7535e00458544a287fed3551 100644 (file)
--- a/test/rejectlog/0021
+++ b/test/rejectlog/0021
@@ -5,9 +5,9 @@ P 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
        (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

 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: userx@test1
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: userx@test1

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 1999-03-02 09:44:33 10HmaY-0005vi-00 F=<ok@test2> rejected by non-SMTP ACL: cannot test hosts condition in non-SMTP ACL
 Envelope-from: <ok@test2>
 Envelope-to: <userx@test.ex>
 1999-03-02 09:44:33 10HmaY-0005vi-00 F=<ok@test2> rejected by non-SMTP ACL: cannot test hosts condition in non-SMTP ACL
 Envelope-from: <ok@test2>
 Envelope-to: <userx@test.ex>


@@ -15,9 +15,9 @@ P 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
        (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

 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: ok@test2
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: ok@test2

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 1999-03-02 09:44:33 10HmaZ-0005vi-00 F=<ok@test4> rejected by non-SMTP ACL: no verified certificate
 Envelope-from: <ok@test4>
 Envelope-to: <userx@test.ex>
 1999-03-02 09:44:33 10HmaZ-0005vi-00 F=<ok@test4> rejected by non-SMTP ACL: no verified certificate
 Envelope-from: <ok@test4>
 Envelope-to: <userx@test.ex>


@@ -25,9 +25,9 @@ P 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
        (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

 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 F From: ok@test4
 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 F From: ok@test4

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 1999-03-02 09:44:33 H=[10.9.8.7] U=CALLER rejected connection in "connect" ACL
 1999-03-02 09:44:33 H=[10.9.8.8] U=CALLER rejected MAIL <bad@test1>
 1999-03-02 09:44:33 mail accepted "mail from:<ok@test1>" "<ok@test1>"
 1999-03-02 09:44:33 H=[10.9.8.7] U=CALLER rejected connection in "connect" ACL
 1999-03-02 09:44:33 H=[10.9.8.8] U=CALLER rejected MAIL <bad@test1>
 1999-03-02 09:44:33 mail accepted "mail from:<ok@test1>" "<ok@test1>"


@@ -42,9 +42,9 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <userx@test1>)
        id 10HmbA-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <userx@test1>)
        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

 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 F From: userx@test1
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 F From: userx@test1

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 1999-03-02 09:44:33 10HmbB-0005vi-00 F=<userx@test1> rejected by non-SMTP ACL: don't like sender userx@test1
 Envelope-from: <userx@test1>
 Envelope-to: <userx@test.ex>
 1999-03-02 09:44:33 10HmbB-0005vi-00 F=<userx@test1> rejected by non-SMTP ACL: don't like sender userx@test1
 Envelope-from: <userx@test1>
 Envelope-to: <userx@test.ex>


@@ -52,8 +52,8 @@ P 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
        (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

 I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 F From: userx@test1
 I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 F From: userx@test1

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 1999-03-02 09:44:33 H=(test.ex) [10.9.8.8] U=CALLER rejected EHLO or HELO test.ex
 1999-03-02 09:44:33 mail accepted "mail from: <ok@test3> SIZE=ssss" "<ok@test3> SIZE=1234"
 1999-03-02 09:44:33 H=(test.ex) [10.9.8.8] U=CALLER rejected EHLO or HELO test.ex
 1999-03-02 09:44:33 mail accepted "mail from: <ok@test3> SIZE=ssss" "<ok@test3> SIZE=1234"

diff --git a/test/rejectlog/0026 b/test/rejectlog/0026
index 716e35cf0006653e71d44ce6bd4cdd5542bf51a2..2d97471f9c8c2f9ccf1496d4c20feef040615f91 100644 (file)
--- a/test/rejectlog/0026
+++ b/test/rejectlog/0026
@@ -5,27 +5,27 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-F From: @
-I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000

+I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+F From: @

 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
 Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaY-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
 Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaY-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-F From: <x@y>, @
-I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>

   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000

+I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+F From: <x@y>, @

 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaZ-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaZ-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-F From: <x@y>
-I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>

   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000

+I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+F From: <x@y>

   X-warning: this is a test warning
 1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<x@y> rejected after DATA: body contains trigger
 Envelope-from: <x@y>
   X-warning: this is a test warning
 1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<x@y> rejected after DATA: body contains trigger
 Envelope-from: <x@y>


@@ -34,17 +34,17 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmbA-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <x@y>)
        id 10HmbA-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 F From: x@y
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 F From: x@y

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <userx@test.ex>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmbB-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <userx@test.ex>
 P Received: from CALLER by myhost.test.ex with local-smtp (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
+I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>

 T to: group name: x@y, p@q;
 R reply-to: group name:;
 T to: group name: x@y, p@q;
 R reply-to: group name:;

-I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000

   X-warning: this is a test warning
   X-warning: this is a test warning

diff --git a/test/rejectlog/0027 b/test/rejectlog/0027
index 9a94214338332053f9dab00747f6cfe2f25b3745..bff8a746c25d28d0cdc5d95c1f5008062d4679ed 100644 (file)
--- a/test/rejectlog/0027
+++ b/test/rejectlog/0027
@@ -13,24 +13,24 @@ Envelope-to: <data@test.ex>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaX-0005vi-00
        for data@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaX-0005vi-00
        for data@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-  Subject: data1
-I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000

+I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+  Subject: data1

 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot test domains condition in DATA ACL
 Envelope-from: <>
 Envelope-to: <data@test.ex>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaY-0005vi-00
        for data@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot test domains condition in DATA ACL
 Envelope-from: <>
 Envelope-to: <data@test.ex>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaY-0005vi-00
        for data@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-  Subject: data2
-I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>

   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000

+I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+  Subject: data2

 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot test local_parts condition in DATA ACL
 Envelope-from: <>
 Envelope-to: <data@test.ex>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaZ-0005vi-00
        for data@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot test local_parts condition in DATA ACL
 Envelope-from: <>
 Envelope-to: <data@test.ex>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaZ-0005vi-00
        for data@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-  Subject: data3
-I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>

   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000

+I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+  Subject: data3

diff --git a/test/rejectlog/0028 b/test/rejectlog/0028
index 32a9d05766a182a10f1a748a5a318022625a5f35..c1888ad688f3bc0650973eb20f7e9e8099d221b4 100644 (file)
--- a/test/rejectlog/0028
+++ b/test/rejectlog/0028
@@ -5,7 +5,7 @@ P Received: from CALLER by myhost.test.ex with local-smtp (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
        (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

 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 1999-03-02 09:44:33 U=CALLER F=<x@y> rejected RCPT <userx@test.ex>: SIZE value too big
 1999-03-02 09:44:33 U=CALLER F=<x@y> rejected RCPT <userx@test.ex>: SIZE value too big

diff --git a/test/rejectlog/0181 b/test/rejectlog/0181
index ea4814552bcd376fc75e286d24a573ba2b242be2..47ca48209c8b03bc7b254e80e00845b0694eab89 100644 (file)
--- a/test/rejectlog/0181
+++ b/test/rejectlog/0181
@@ -1,12 +1,12 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 rejected from <CALLER@myhost.test.ex> U=CALLER: message too big: read=225 max=100
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@test.ex>
 1999-03-02 09:44:33 10HmaX-0005vi-00 rejected from <CALLER@myhost.test.ex> U=CALLER: message too big: read=225 max=100
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@test.ex>

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 1999-03-02 09:44:33 10HmaY-0005vi-00 rejected from <CALLER@myhost.test.ex> U=CALLER: message too big: read=101 max=100
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@myhost.test.ex>
 1999-03-02 09:44:33 10HmaY-0005vi-00 rejected from <CALLER@myhost.test.ex> U=CALLER: message too big: read=101 max=100
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@myhost.test.ex>

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/rejectlog/0220 b/test/rejectlog/0220
index 0ea1b2a0b53877a1267970fefdccbd2743594988..f322fefc32270c136f8013c3d6c392ee222a42ef 100644 (file)
--- a/test/rejectlog/0220
+++ b/test/rejectlog/0220
@@ -1,6 +1,6 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 rejected from <> U=CALLER: message too big: read=501 max=500
 Envelope-from: <>
 Envelope-to: <userx@myhost.test.ex>
 1999-03-02 09:44:33 10HmaX-0005vi-00 rejected from <> U=CALLER: message too big: read=501 max=500
 Envelope-from: <>
 Envelope-to: <userx@myhost.test.ex>

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/rejectlog/0221 b/test/rejectlog/0221
index 0ea1b2a0b53877a1267970fefdccbd2743594988..f322fefc32270c136f8013c3d6c392ee222a42ef 100644 (file)
--- a/test/rejectlog/0221
+++ b/test/rejectlog/0221
@@ -1,6 +1,6 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 rejected from <> U=CALLER: message too big: read=501 max=500
 Envelope-from: <>
 Envelope-to: <userx@myhost.test.ex>
 1999-03-02 09:44:33 10HmaX-0005vi-00 rejected from <> U=CALLER: message too big: read=501 max=500
 Envelope-from: <>
 Envelope-to: <userx@myhost.test.ex>

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/rejectlog/0365 b/test/rejectlog/0365
index 5dbe6259ac873d6840346ccf2b4b8b5e5a380669..30b7ac01f0648a7218a3719696b4dd09f6ea3a7d 100644 (file)
--- a/test/rejectlog/0365
+++ b/test/rejectlog/0365
@@ -4,18 +4,18 @@ Envelope-to: <x@y>
 P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
 P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-F From: <bad@syntax
-I Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000

+I Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+F From: <bad@syntax

 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        id 10HmaY-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        id 10HmaY-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-F From: bad@domain
-I Message-Id: <E10HmaY-0005vi-00@the.local.host.name>

   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000

+I Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+F From: bad@domain

 1999-03-02 09:44:33 U=CALLER sender verify defer for <callout@x>: could not connect to V4NET.0.0.0 [V4NET.0.0.0]: Network Error
 1999-03-02 09:44:33 U=CALLER F=<callout@x> temporarily rejected RCPT <x@y>: Could not complete sender verify callout
 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<nosyntax@x> rejected after DATA
 1999-03-02 09:44:33 U=CALLER sender verify defer for <callout@x>: could not connect to V4NET.0.0.0 [V4NET.0.0.0]: Network Error
 1999-03-02 09:44:33 U=CALLER F=<callout@x> temporarily rejected RCPT <x@y>: Could not complete sender verify callout
 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<nosyntax@x> rejected after DATA


@@ -25,18 +25,18 @@ P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        (envelope-from <nosyntax@x>)
        id 10HmaZ-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <nosyntax@x>)
        id 10HmaZ-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-F From: <bad@syntax
-I Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>

   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000

+I Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
+F From: <bad@syntax

 1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        id 10HmbA-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
 1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>
 P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
        id 10HmbA-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-F From: <unverifiable@y>
-I Message-Id: <E10HmbA-0005vi-00@the.local.host.name>

   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000

+I Message-Id: <E10HmbA-0005vi-00@the.local.host.name>
+F From: <unverifiable@y>

 1999-03-02 09:44:33 U=CALLER F=<recipcallout@y> temporarily rejected RCPT <callout@y>: could not connect to V4NET.0.0.0 [V4NET.0.0.0]: Network Error
 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <cantverify.fail@y>: failure message
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <cantverify.defer@y>: defer message
 1999-03-02 09:44:33 U=CALLER F=<recipcallout@y> temporarily rejected RCPT <callout@y>: could not connect to V4NET.0.0.0 [V4NET.0.0.0]: Network Error
 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <cantverify.fail@y>: failure message
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <cantverify.defer@y>: defer message

diff --git a/test/rejectlog/0451 b/test/rejectlog/0451
index e2616875e29f63219db87113d82c4717c6c1b1f6..ef3633778cc29befcf3aea33367716db91d47147 100644 (file)
--- a/test/rejectlog/0451
+++ b/test/rejectlog/0451
@@ -6,9 +6,9 @@ P Received: from CALLER (helo=a.b.c.d)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for good@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for good@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@test.ex> rejected after DATA: Sender verify failed
 Envelope-from: <CALLER@test.ex>
 Envelope-to: <good@test.ex>
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@test.ex> rejected after DATA: Sender verify failed
 Envelope-from: <CALLER@test.ex>
 Envelope-to: <good@test.ex>


@@ -17,6 +17,6 @@ P Received: from CALLER (helo=a.b.c.d)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for good@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for good@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/rejectlog/0465 b/test/rejectlog/0465
index cab14385862ed2c84405cde5e0f6c90c1e018b9b..51402d1fa2bbbdccee21698a665bd73ba3357047 100644 (file)
--- a/test/rejectlog/0465
+++ b/test/rejectlog/0465
@@ -4,6 +4,6 @@ Envelope-to: <abc@xyz>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaX-0005vi-00
        for abc@xyz; Tue, 2 Mar 1999 09:44:33 +0000
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaX-0005vi-00
        for abc@xyz; Tue, 2 Mar 1999 09:44:33 +0000

-T To: abc@xyz.
-I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000

+I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+T To: abc@xyz.

diff --git a/test/rejectlog/0468 b/test/rejectlog/0468
index b2ece3e1f2a52a78f01dc3c7429b8cf443c5073b..c86cd555d00efa908c3528f05d8d32505884edb2 100644 (file)
--- a/test/rejectlog/0468
+++ b/test/rejectlog/0468
@@ -5,9 +5,9 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: message body <This is the SECOND message body. > message end <This is the SECOND message body. >
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <x@y>
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: message body <This is the SECOND message body. > message end <This is the SECOND message body. >
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <x@y>


@@ -15,6 +15,6 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/rejectlog/0490 b/test/rejectlog/0490
index ef53406f4dbc0b206bf090341af724189b83fad2..47afbaa7c2cc874c6051495ad26f2779cce35bb1 100644 (file)
--- a/test/rejectlog/0490
+++ b/test/rejectlog/0490
@@ -5,6 +5,6 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for aa@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for aa@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/rejectlog/0505 b/test/rejectlog/0505
index 2c56b7f1ea6d0c87ab33ffe6bd6ede8b046c7408..dd1021153a165fe0d09ee66c75bfe745d464e9af 100644 (file)
--- a/test/rejectlog/0505
+++ b/test/rejectlog/0505
@@ -5,9 +5,9 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@x.y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@x.y; Tue, 2 Mar 1999 09:44:33 +0000

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 1999-03-02 09:44:33 U=CALLER temporarily rejected EHLO or HELO xxx: cannot use "control=submission" in EHLO or HELO ACL
 1999-03-02 09:44:33 10HmaY-0005vi-00 F=<CALLER@myhost.test.ex> rejected by non-SMTP ACL: cannot use "control=enforce_sync" in non-SMTP ACL
 Envelope-from: <CALLER@myhost.test.ex>
 1999-03-02 09:44:33 U=CALLER temporarily rejected EHLO or HELO xxx: cannot use "control=submission" in EHLO or HELO ACL
 1999-03-02 09:44:33 10HmaY-0005vi-00 F=<CALLER@myhost.test.ex> rejected by non-SMTP ACL: cannot use "control=enforce_sync" in non-SMTP ACL
 Envelope-from: <CALLER@myhost.test.ex>


@@ -16,7 +16,7 @@ P 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
        (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

 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 1999-03-02 09:44:33 U=CALLER temporarily rejected connection in "connect" ACL: cannot use "control=queue_only" in connection ACL
 1999-03-02 09:44:33 U=CALLER temporarily rejected connection in "connect" ACL: cannot use "control=queue_only" in connection ACL

diff --git a/test/rejectlog/0507 b/test/rejectlog/0507
index 957071a1fb3a5ff56ac8a3470568d0676fc9c90b..28b2f5f7e1519122133669a464b2a4c365fd3bba 100644 (file)
--- a/test/rejectlog/0507
+++ b/test/rejectlog/0507
@@ -5,10 +5,10 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000

-T To: a@b.c, himself <usery@dom.com>
+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

+T To: a@b.c, himself <usery@dom.com>

 F From: CALLER_NAME <CALLER@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>


@@ -16,10 +16,10 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000

-T To: a@b.c, himself <usery@dom.com>
+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>

+T To: a@b.c, himself <usery@dom.com>

 F From: CALLER_NAME <CALLER@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>
 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>


@@ -28,9 +28,9 @@ Envelope-to: <userx@dom.com>
 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 P Received: from CALLER by myhost.test.ex with local-smtp (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
+I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>

 T To: a@b.c, himself <usery@dom.com>
 * Cc: unqualified, userx@dom.com, x@y.z
 C Cc: unqualified@myhost.test.ex, userx@dom.com, x@y.z
 T To: a@b.c, himself <usery@dom.com>
 * Cc: unqualified, userx@dom.com, x@y.z
 C Cc: unqualified@myhost.test.ex, userx@dom.com, x@y.z

-I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>

 F From: CALLER_NAME <CALLER@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/rejectlog/0536 b/test/rejectlog/0536
index bf06473b651ffa25f745b5f2eead9c9f8d279e61..d395838c7495383ae5e452edb3aa484c2097b45d 100644 (file)
--- a/test/rejectlog/0536
+++ b/test/rejectlog/0536
@@ -23,9 +23,9 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <user1@test.ex>)
        id 10HmaX-0005vi-00
        for user1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <user1@test.ex>)
        id 10HmaX-0005vi-00
        for user1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: user1@test.ex
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: user1@test.ex

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 1999-03-02 09:44:33 10HmaY-0005vi-00 F=<user2@test.ex> rejected by non-SMTP ACL: 599 Main code
 Envelope-from: <user2@test.ex>
 Envelope-to: <user1@myhost.test.ex>
 1999-03-02 09:44:33 10HmaY-0005vi-00 F=<user2@test.ex> rejected by non-SMTP ACL: 599 Main code
 Envelope-from: <user2@test.ex>
 Envelope-to: <user1@myhost.test.ex>


@@ -33,9 +33,9 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <user2@test.ex>)
        id 10HmaY-0005vi-00
        for user1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <user2@test.ex>)
        id 10HmaY-0005vi-00
        for user1@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: user2@test.ex
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: user2@test.ex

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <user20@test.ex>: No code
 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <user21@test.ex>: Main code
 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <user22@test.ex>: Main and extended code
 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <user20@test.ex>: No code
 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <user21@test.ex>: Main code
 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <user22@test.ex>: Main and extended code

diff --git a/test/rejectlog/0539 b/test/rejectlog/0539
index 74da8e6e1dd48e9db1c4f80e2010c72850e45837..6191a89fb397921451a3dfdaf52067680b3646ae 100644 (file)
--- a/test/rejectlog/0539
+++ b/test/rejectlog/0539
@@ -9,6 +9,6 @@ P 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
        (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

 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/stderr/0275 b/test/stderr/0275
index 79cdb9dfc740c541b7c48ab0971a3ef07d700cd9..0838fe389d484f3351e72f108128287e15f3e3a8 100644 (file)
--- a/test/stderr/0275
+++ b/test/stderr/0275
@@ -119,9 +119,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line

diff --git a/test/stderr/0278 b/test/stderr/0278
index 39c5a5692ae99592ec9254ac6300ce509834868c..a262cb712404e468d322f295724e56b00d13db95 100644 (file)
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -78,9 +78,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line

diff --git a/test/stderr/0294 b/test/stderr/0294
index 184cf9f41cc892f9d0f184af8b9d4e2ebd8a3eea..896e8ea39681f96951628d7ea9c6736eec7bd7fb 100644 (file)
--- a/test/stderr/0294
+++ b/test/stderr/0294
@@ -29,9 +29,9 @@ SMTP>> 354 Enter message, ending with "." on a line by itself
 >>Headers received:
 
 >>Headers after rewriting and local additions:
 >>Headers received:
 
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: x@y
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: x@y

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line


@@ -57,9 +57,9 @@ SMTP>> 354 Enter message, ending with "." on a line by itself
 >>Headers received:
 
 >>Headers after rewriting and local additions:
 >>Headers received:
 
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: x@y
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: x@y

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line

diff --git a/test/stderr/0317 b/test/stderr/0317
index 4a28f262023f7e3b3d71e1f373ff95bf37d3d258..c0ea3d0b4f9a44a2390ed56c4cd7759ee6111756 100644 (file)
--- a/test/stderr/0317
+++ b/test/stderr/0317
@@ -10,12 +10,12 @@ Cc: a@b.c
 Bcc: p@q.r
 
 >>Headers after rewriting and local additions:
 Bcc: p@q.r
 
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>

 T To: x@y.z
 C Cc: a@b.c
 * Bcc: p@q.r
 T To: x@y.z
 C Cc: a@b.c
 * Bcc: p@q.r

-I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>

 F From: CALLER_NAME <CALLER@test.ex>
 F From: CALLER_NAME <CALLER@test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line


@@ -45,15 +45,15 @@ Resent-cc: pp@qq.rr
 Resent-bcc: xx@yy.zz
 
 >>Headers after rewriting and local additions:
 Resent-bcc: xx@yy.zz
 
 >>Headers after rewriting and local additions:

+  Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Resent-Message-Id: <E10HmaY-0005vi-00@mail.test.ex>

 T To: x@y.z
 C Cc: a@b.c
 B Bcc: p@q.r
 T Resent-to: aa@bb.cc
 C Resent-cc: pp@qq.rr
 * Resent-bcc: xx@yy.zz
 T To: x@y.z
 C Cc: a@b.c
 B Bcc: p@q.r
 T Resent-to: aa@bb.cc
 C Resent-cc: pp@qq.rr
 * Resent-bcc: xx@yy.zz

-I Resent-Message-Id: <E10HmaY-0005vi-00@mail.test.ex>

 F Resent-From: CALLER_NAME <CALLER@test.ex>
 F Resent-From: CALLER_NAME <CALLER@test.ex>

-  Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line

diff --git a/test/stderr/0361 b/test/stderr/0361
index 07e0ce3d142929c5d49ff975365d9901a6bf8f0e..62c2b9d4c3061c431dfd2828660b4502a50e8b3a 100644 (file)
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -27,9 +27,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 F From: CALLER_NAME <CALLER@test.ex>
 I Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 F From: CALLER_NAME <CALLER@test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line

diff --git a/test/stderr/0388 b/test/stderr/0388
index f7855826ff9b499b08ed7e35f59ca5ec4f0ca182..eaa4ec0447ea8d439bb90eebd0176092c1900219 100644 (file)
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -186,13 +186,13 @@ rewrite_one_header: type=T:
   To: CALLER@myhost.test.ex
 search_tidyup called
 >>Headers after rewriting and local additions:
   To: CALLER@myhost.test.ex
 search_tidyup called
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>

   X-Failed-Recipients: x@y
   Auto-Submitted: auto-replied
 F From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 T To: CALLER@myhost.test.ex
   Subject: Mail delivery failed: returning message to sender
   X-Failed-Recipients: x@y
   Auto-Submitted: auto-replied
 F From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 T To: CALLER@myhost.test.ex
   Subject: Mail delivery failed: returning message to sender

-I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line

diff --git a/test/stderr/0402 b/test/stderr/0402
index 20c2e7b3fb0007c99f3c85a2d8cde53e8cfa5065..902c1409581b5a3f2c029bb3c32c0ef663483969 100644 (file)
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -28,9 +28,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
 I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaX-0005vi-00
 expanding: ${tod_full}
 
 Data file written for message 10HmaX-0005vi-00
 expanding: ${tod_full}

diff --git a/test/stderr/0403 b/test/stderr/0403
index 14e70286aaca012983a4eb7eaa546127ad8c986c..718e5716325426cb4c4d0494c26ab51b18e944cc 100644 (file)
--- a/test/stderr/0403
+++ b/test/stderr/0403
@@ -20,9 +20,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
 I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line

diff --git a/test/stderr/0404 b/test/stderr/0404
index d37788c05c56dbe2d621811a12c9b51f5e343824..4f8296add712c4ca00388c7359a6570a4b4910dc 100644 (file)
--- a/test/stderr/0404
+++ b/test/stderr/0404
@@ -87,6 +87,8 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>

 R Reply-to: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,
  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,
  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,
 R Reply-to: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,
  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,
  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,


@@ -119,9 +121,7 @@ R Reply-to: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,
  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,
  sender@test.ex, sender@test.ex, sender@
 **** debug string too long - truncated ****
  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,
  sender@test.ex, sender@test.ex, sender@
 **** debug string too long - truncated ****

-I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>

 F From: CALLER_NAME <CALLER@test.ex>
 F From: CALLER_NAME <CALLER@test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line


@@ -265,14 +265,14 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000
+I Message-Id: <E10HmaY-0005vi-00@mail.test.ex>

 T To: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.e
 **** debug string too long - truncated ****
   In-Reply-To: <E10HmaX-0005vi-00@mail.test.ex>
   References: <E10HmaX-0005vi-00@mail.test.ex>
   Auto-Submitted: auto-replied
 T To: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex,  sender@test.ex, sender@test.ex, sender@test.e
 **** debug string too long - truncated ****
   In-Reply-To: <E10HmaX-0005vi-00@mail.test.ex>
   References: <E10HmaX-0005vi-00@mail.test.ex>
   Auto-Submitted: auto-replied

-I Message-Id: <E10HmaY-0005vi-00@mail.test.ex>

 F From: CALLER_NAME <CALLER@test.ex>
 F From: CALLER_NAME <CALLER@test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line

diff --git a/test/stderr/0408 b/test/stderr/0408
index 8eeab810cc2bb2665343046deb20204106e55da1..4fae9e9f6856e4890ed01ef77b42015ca8998422 100644 (file)
--- a/test/stderr/0408
+++ b/test/stderr/0408
@@ -20,9 +20,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
 I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line

diff --git a/test/stderr/0465 b/test/stderr/0465
index 4c84b14539f234e3fd22248847406d27a6531c59..d4d4fd2033dfce22166eb0c95d424a01abffe980 100644 (file)
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -63,9 +63,9 @@ rewrite_one_header: type=T:
   To: abc@domain.
 search_tidyup called
 >>Headers after rewriting and local additions:
   To: abc@domain.
 search_tidyup called
 >>Headers after rewriting and local additions:

-T To: abc@domain.
-I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>

   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000

+I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+T To: abc@domain.

 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line


@@ -125,9 +125,9 @@ rewrite_one_header: type=T:
   To: abc@xyz.
 search_tidyup called
 >>Headers after rewriting and local additions:
   To: abc@xyz.
 search_tidyup called
 >>Headers after rewriting and local additions:

-T To: abc@xyz.
-I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

   Date: Tue, 2 Mar 1999 09:44:33 +0000
   Date: Tue, 2 Mar 1999 09:44:33 +0000

+I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+T To: abc@xyz.

 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line

diff --git a/test/stderr/0489 b/test/stderr/0489
index 291dda64560f20239c4077cc544fd6782cf8cf94..ffcf33dec4b0e2ab7e7b2d6ec89ff85ffd7137f9 100644 (file)
--- a/test/stderr/0489
+++ b/test/stderr/0489
@@ -10,9 +10,9 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
 >>Headers received:
 
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: "Phil Q. Hazel" <CALLER@myhost.test.ex>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: "Phil Q. Hazel" <CALLER@myhost.test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line


@@ -40,9 +40,9 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
 >>Headers received:
 
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: John "Jack" Smith <CALLER@myhost.test.ex>
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: John "Jack" Smith <CALLER@myhost.test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line


@@ -69,9 +69,9 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
 >>Headers received:
 
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 F From: John "Jack" "Q." Smith <CALLER@myhost.test.ex>
 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 F From: John "Jack" "Q." Smith <CALLER@myhost.test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaZ-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaZ-0005vi-00
 >>Generated Received: header line


@@ -98,9 +98,9 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
 >>Headers received:
 
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 F From: "John (Jack) Q. Smith" <CALLER@myhost.test.ex>
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 F From: "John (Jack) Q. Smith" <CALLER@myhost.test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmbA-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmbA-0005vi-00
 >>Generated Received: header line


@@ -127,9 +127,9 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
 >>Headers received:
 
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 F From: John ("Jack") "Q." Smith <CALLER@myhost.test.ex>
 I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 F From: John ("Jack") "Q." Smith <CALLER@myhost.test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmbB-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmbB-0005vi-00
 >>Generated Received: header line


@@ -156,9 +156,9 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
 >>Headers received:
 
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 F From: "John (\"Jack\") Q. Smith" <CALLER@myhost.test.ex>
 I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 F From: "John (\"Jack\") Q. Smith" <CALLER@myhost.test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmbC-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmbC-0005vi-00
 >>Generated Received: header line


@@ -185,9 +185,9 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
 >>Headers received:
 
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 F From: "Phil \"Q Hazel" <CALLER@myhost.test.ex>
 I Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 F From: "Phil \"Q Hazel" <CALLER@myhost.test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmbD-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmbD-0005vi-00
 >>Generated Received: header line


@@ -214,9 +214,9 @@ Recipients:
 >>Headers received:
 
 >>Headers after rewriting and local additions:
 >>Headers received:
 
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 F From: "Phil \"Q" "X." Hazel <CALLER@myhost.test.ex>
 I Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
 F From: "Phil \"Q" "X." Hazel <CALLER@myhost.test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmbE-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmbE-0005vi-00
 >>Generated Received: header line

diff --git a/test/stderr/2600 b/test/stderr/2600
index 64b3133b1bdf4bb823c67e11c69203306a4f17a2..bc770e28d88093408307e01adec455a538b135fc 100644 (file)
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -294,9 +294,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@myhost.test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
   From: CALLER_NAME <CALLER@myhost.test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@myhost.test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line

diff --git a/test/stderr/5004 b/test/stderr/5004
index 4d6968f19d88d98729601db81a7fa2aa9ab2435d..0272c2a041c22af5e4b69b1779b362beeef7d620 100644 (file)
--- a/test/stderr/5004
+++ b/test/stderr/5004
@@ -22,9 +22,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
 I Message-Id: <E10HmaX-0005vi-00@mail.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line

diff --git a/test/stderr/5005 b/test/stderr/5005
index e27fbfaac195ade2145fd1eca56eeac0784d61c0..a471ce79a8cc500cd3984d88b9ab31d04ec1e5fd 100644 (file)
--- a/test/stderr/5005
+++ b/test/stderr/5005
@@ -20,9 +20,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line


@@ -188,9 +188,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
 I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line


@@ -356,9 +356,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
 I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaZ-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaZ-0005vi-00
 >>Generated Received: header line


@@ -535,9 +535,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
 I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmbA-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmbA-0005vi-00
 >>Generated Received: header line

diff --git a/test/stderr/5006 b/test/stderr/5006
index 1dd6dc9ce9cf4187aad360b316c9882e0df746c9..af10c5b135f9ea3a5ec51a2af5419b6c42833100 100644 (file)
--- a/test/stderr/5006
+++ b/test/stderr/5006
@@ -20,9 +20,9 @@ rewrite_one_header: type=F:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:
   From: CALLER_NAME <CALLER@test.ex>
 search_tidyup called
 >>Headers after rewriting and local additions:

+  Date: Tue, 2 Mar 1999 09:44:33 +0000

 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>
 I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 F From: CALLER_NAME <CALLER@test.ex>

-  Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line

diff --git a/test/stdout/0015 b/test/stdout/0015
index d82e3cbc933aa308d46d4e4166b0a09533c40318..d4c476794a888dbd34dbf5d1c8c341b0bbfec21d 100644 (file)
--- a/test/stdout/0015
+++ b/test/stdout/0015
@@ -15,9 +15,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbE-0005vi-00
        for S+userx@Test.Ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbE-0005vi-00
        for S+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>
 Message-Id: <E10HmbE-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 More text.
 .
 
 More text.
 .


@@ -40,9 +40,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-S@Test.Ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbG-0005vi-00
        for Userx-S@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>
 Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 More text.
 .
 
 More text.
 .

diff --git a/test/stdout/0033 b/test/stdout/0033
index 82aa1e93e67c7ae805f928ef38d80154fc207d92..5df5759d1aa514fe3ee298cfab44197947187ec7 100644 (file)
--- a/test/stdout/0033
+++ b/test/stdout/0033
@@ -19,9 +19,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for list@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for list@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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK


@@ -47,9 +47,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for list@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for list@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>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK

diff --git a/test/stdout/0035 b/test/stdout/0035
index 6b5928b776a2154c371972f03c5472852bdc5177..c80d9fd9d036db40342db4fcc05052df3ea609db 100644 (file)
--- a/test/stdout/0035
+++ b/test/stdout/0035
@@ -174,9 +174,9 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
        (envelope-from <a@y>)
        id 10HmaY-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <a@y>)
        id 10HmaY-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

+038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 dddF From: a@y
 047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 dddF From: a@y

-038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 10HmaZ-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <>
 10HmaZ-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <>


@@ -196,8 +196,8 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
        by myhost.test.ex with esmtp (Exim x.yz)
        id 10HmaZ-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        by myhost.test.ex with esmtp (Exim x.yz)
        id 10HmaZ-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-047I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>

 038  Date: Tue, 2 Mar 1999 09:44:33 +0000
 038  Date: Tue, 2 Mar 1999 09:44:33 +0000

+047I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>

 10HmbA-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <notsubmit@y>
 10HmbA-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <notsubmit@y>


@@ -239,10 +239,10 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
        (envelope-from <a@y>)
        id 10HmbB-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <a@y>)
        id 10HmbB-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-ddd* Sender: sender@some.where
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 047I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 047I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>

+ddd* Sender: sender@some.where

 dddF From: a@y
 dddF From: a@y

-038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 10HmbC-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <a@y>
 10HmbC-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <a@y>


@@ -263,10 +263,10 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
        (envelope-from <a@y>)
        id 10HmbC-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <a@y>)
        id 10HmbC-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-dddS Sender: sender@some.where
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 047I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 047I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>

+dddS Sender: sender@some.where

 dddF From: a@y
 dddF From: a@y

-038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 10HmbD-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <a@y>
 10HmbD-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <a@y>


@@ -287,7 +287,7 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
        (envelope-from <a@y>)
        id 10HmbD-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <a@y>)
        id 10HmbD-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-ddd* Sender: sender@some.where
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 047I Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 047I Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>

+ddd* Sender: sender@some.where

 dddF From: SomeName <a@y>
 dddF From: SomeName <a@y>

-038  Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/stdout/0037 b/test/stdout/0037
index 603298279a627ff021edd06bfaed54344d9f5dfd..4c8bdd5c2bff0e0a84b4070fb0af0f063afdb3c8 100644 (file)
--- a/test/stdout/0037
+++ b/test/stdout/0037
@@ -239,11 +239,11 @@ Recipient   = CALLER@test.ex
 Testing Exim filter file "TESTSUITE/aux-var/0037.F"
 
 Testprint: ------------------------------------------------
 Testing Exim filter file "TESTSUITE/aux-var/0037.F"
 
 Testprint: ------------------------------------------------

-Testprint: Test-headers: first one\nFrom: x@y\nTest-headers: another one\nMore-test-headers : yet another one\nSubject: testing, testing\nMessage-Id: <E10HmcF-0005vi-00@the.local.host.name>\nDate: Tue, 2 Mar 1999 09:44:33 +0000
+Testprint: Date: Tue, 2 Mar 1999 09:44:33 +0000\nMessage-Id: <E10HmcF-0005vi-00@the.local.host.name>\nTest-headers: first one\nFrom: x@y\nTest-headers: another one\nMore-test-headers : yet another one\nSubject: testing, testing

 Testprint: ------------------------------------------------
 Headers remove "test-headers:more-test-headers"
 Headers add "added-header: this is added\nadded-header2: a second line"
 Testprint: ------------------------------------------------
 Headers remove "test-headers:more-test-headers"
 Headers add "added-header: this is added\nadded-header2: a second line"

-Testprint: From: x@y\nSubject: testing, testing\nMessage-Id: <E10HmcF-0005vi-00@the.local.host.name>\nDate: Tue, 2 Mar 1999 09:44:33 +0000\nadded-header: this is added\nadded-header2: a second line
+Testprint: Date: Tue, 2 Mar 1999 09:44:33 +0000\nMessage-Id: <E10HmcF-0005vi-00@the.local.host.name>\nFrom: x@y\nSubject: testing, testing\nadded-header: this is added\nadded-header2: a second line

 Testprint: ------------------------------------------------
 Testprint: message_size      = 122
 Testprint: message_body_size = 0
 Testprint: ------------------------------------------------
 Testprint: message_size      = 122
 Testprint: message_body_size = 0

diff --git a/test/stdout/0093 b/test/stdout/0093
index 4762c64ac64008a464212edb12f8466f351511ce..236300048ae04be88af93d84c1d313880b753d41 100644 (file)
--- a/test/stdout/0093
+++ b/test/stdout/0093
@@ -27,11 +27,11 @@ Testing Exim filter file "TESTSUITE/aux-fixed/0093.f-3"
 Testprint: From: is defined
 Testprint: Absent: is not defined
 Testprint: ----------------------
 Testprint: From: is defined
 Testprint: Absent: is not defined
 Testprint: ----------------------

-Testprint: From: a@b\nReply-to: x@y\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nMessage-Id: <E10HmaX-0005vi-00@the.local.host.name>\nSender: CALLER_NAME <CALLER@test.ex>\nDate: Tue, 2 Mar 1999 09:44:33 +0000
+Testprint: Date: Tue, 2 Mar 1999 09:44:33 +0000\nMessage-Id: <E10HmaX-0005vi-00@the.local.host.name>\nFrom: a@b\nReply-to: x@y\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nSender: CALLER_NAME <CALLER@test.ex>

 Testprint: ----------------------
 Testprint: ----------------------

-Testprint: From: a@b\nReply-to: x@y\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nMessage-Id: <E10HmaX-0005vi-00@the.local.host.name>\nSender: CALLER_NAME <CALLER@test.ex>\nDate: Tue, 2 Mar 1999 09:44:33 +0000+++more
+Testprint: Date: Tue, 2 Mar 1999 09:44:33 +0000\nMessage-Id: <E10HmaX-0005vi-00@the.local.host.name>\nFrom: a@b\nReply-to: x@y\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nSender: CALLER_NAME <CALLER@test.ex>+++more

 Testprint: ----------------------
 Testprint: ----------------------

-Testprint: +++From: a@b\nReply-to: x@y\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nMessage-Id: <E10HmaX-0005vi-00@the.local.host.name>\nSender: CALLER_NAME <CALLER@test.ex>\nDate: Tue, 2 Mar 1999 09:44:33 +0000+++
+Testprint: +++Date: Tue, 2 Mar 1999 09:44:33 +0000\nMessage-Id: <E10HmaX-0005vi-00@the.local.host.name>\nFrom: a@b\nReply-to: x@y\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nRepeated: this header is repeated\n          and continued\nEmpty:\nRepeated-empty:\nRepeated-empty:\nRepeated-empty:\nSubject: this is the subject\nSender: CALLER_NAME <CALLER@test.ex>+++

 Testprint: ----------------------
 Testprint: From: >a@b<
 Testprint: this header is repeated\n          and continued\nthis header is repeated\n          and continued\nthis header is repeated\n          and continued
 Testprint: ----------------------
 Testprint: From: >a@b<
 Testprint: this header is repeated\n          and continued\nthis header is repeated\n          and continued\nthis header is repeated\n          and continued

diff --git a/test/stdout/0100 b/test/stdout/0100
index f4c25d7e5f7e2e2f78ea439571691e99403303bb..5d260e7356de28419651f35c788a8cc6f069fd9b 100644 (file)
--- a/test/stdout/0100
+++ b/test/stdout/0100
@@ -15,10 +15,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbD-0005vi-00
        for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbD-0005vi-00
        for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000

-..dotheader: This is perfectly legal
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbD-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbD-0005vi-00@the.local.host.name>

+..dotheader: This is perfectly legal

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 A message containing
 .. a line starting with a dot
 
 A message containing
 .. a line starting with a dot


@@ -46,10 +46,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbM-0005vi-00
        for userx@filtered.com; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbM-0005vi-00
        for userx@filtered.com; Tue, 2 Mar 1999 09:44:33 +0000

-..dotheader: This is perfectly legal
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbM-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbM-0005vi-00@the.local.host.name>

+..dotheader: This is perfectly legal

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 A message containing
 .. a line starting with a dot
 
 A message containing
 .. a line starting with a dot

diff --git a/test/stdout/0101 b/test/stdout/0101
index c5e6a37c34dbb8c9e5270b3964d2142c536e4722..aeda5eb54514ce311ccf1fe4d5cf79d127227d83 100644 (file)
--- a/test/stdout/0101
+++ b/test/stdout/0101
@@ -15,10 +15,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
        for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00
        for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000

-..dotheader: This is perfectly legal
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbB-0005vi-00@the.local.host.name>

+..dotheader: This is perfectly legal

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 A message containing
 .. a line starting with a dot
 
 A message containing
 .. a line starting with a dot

diff --git a/test/stdout/0143 b/test/stdout/0143
index 1075fed7fb30ad593f2c43748ddeaad5f004551f..32e92d513239a917479d0614d86a417088508b01 100644 (file)
--- a/test/stdout/0143
+++ b/test/stdout/0143
@@ -17,9 +17,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@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@domain.com; 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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK

diff --git a/test/stdout/0163 b/test/stdout/0163
index 8e8832381242541822fc96aa17f28231bab46ef4..bd377b1ff777bb7202103f94bcf1bd7150905b2e 100644 (file)
--- a/test/stdout/0163
+++ b/test/stdout/0163
@@ -16,9 +16,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@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@domain.com; 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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 550 There is a problem with the message, but this response line is over the limit for reasonable SMTP responses. 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890
 
 .
 550 There is a problem with the message, but this response line is over the limit for reasonable SMTP responses. 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890

diff --git a/test/stdout/0177 b/test/stdout/0177
index f558f08d2449fa4ab0c6b1f7bf8f33c8ad023d50..af69f2b2cba8b55599c929b22a1df71f9ba198ff 100644 (file)
--- a/test/stdout/0177
+++ b/test/stdout/0177
@@ -23,10 +23,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbG-0005vi-00
        for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbG-0005vi-00
        for userz@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: freeze this (3)
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbG-0005vi-00@the.local.host.name>
 Message-Id: <E10HmbG-0005vi-00@the.local.host.name>

+Subject: freeze this (3)

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a third message to be frozen.
 .
 
 This is a third message to be frozen.
 .

diff --git a/test/stdout/0179 b/test/stdout/0179
index 9013698dfed2c43e2509ad3c9cff6d7d108c5244..50583d25c7fa594ea583087b75bc85bc383da77a 100644 (file)
--- a/test/stdout/0179
+++ b/test/stdout/0179
@@ -16,9 +16,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@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@domain.com; 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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK


@@ -32,9 +32,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for abcd@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for abcd@domain.com; 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>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK

diff --git a/test/stdout/0185 b/test/stdout/0185
index dba278f7243017cfbc7dec30284cdd9548409d8c..a7122b1d670c7baaa99a395e26261d45f42b41b7 100644 (file)
--- a/test/stdout/0185
+++ b/test/stdout/0185
@@ -19,10 +19,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: freeze this
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

+Subject: freeze this

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a message to be frozen.
 .
 
 This is a message to be frozen.
 .

diff --git a/test/stdout/0190 b/test/stdout/0190
index 66bd28c1cadcba86213965a9bc7b288fd8198c2b..fa9ad7c5a1b0fc57113f7887e51dda4af383bcd7 100644 (file)
--- a/test/stdout/0190
+++ b/test/stdout/0190
@@ -126,9 +126,9 @@ DATA
 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
 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>
 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
 .
 
 Test message
 .


@@ -151,9 +151,9 @@ DATA
 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
 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>
 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
 .
 
 Test message
 .


@@ -176,9 +176,9 @@ DATA
 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
 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>
 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
 .
 
 Test message
 .


@@ -203,9 +203,9 @@ DATA
 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
 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>
 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
 .
 
 Test message
 .


@@ -228,9 +228,9 @@ DATA
 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
 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>
 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
 .
 
 Test message
 .


@@ -257,9 +257,9 @@ DATA
 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
 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>
 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
 .
 
 Test message
 .

diff --git a/test/stdout/0200 b/test/stdout/0200
index 77b589ba59afc3946908521739d752c6341f236c..cb6431636e7dbc178f6f9e9e71356dea8fdecdd1 100644 (file)
--- a/test/stdout/0200
+++ b/test/stdout/0200
@@ -1,2 +1,2 @@
-xx@host.test.ex is undeliverable: mail domain "host.test.ex._bad" is syntactically invalid
-yy@host.test.ex cannot be resolved at this time: lookup of host "bad_host.test.ex" failed in domainlist router: syntax error in name
+xx@host.test.ex is undeliverable: Unrouteable address
+yy@host.test.ex cannot be resolved at this time: lookup of host "bad_host.test.ex" failed in domainlist router

diff --git a/test/stdout/0203 b/test/stdout/0203
index b311e114cbdf7beafeaa80dab9b8ea230297c668..a59fabdbf0d13303989e4dbc3f20ad91f72496ce 100644 (file)
--- a/test/stdout/0203
+++ b/test/stdout/0203
@@ -16,9 +16,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
        (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>
 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
 .
 
 Test message 1
 .

diff --git a/test/stdout/0209 b/test/stdout/0209
index 90a59b2597e028b82d6ecb18b1ba81d4e7b54352..238adf062cc54bfa8ff791cecc44d4a9c5b41a7e 100644 (file)
--- a/test/stdout/0209
+++ b/test/stdout/0209
@@ -32,9 +32,9 @@ DATA
 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
 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>
 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 1
 .
 
 Test message 1
 .

diff --git a/test/stdout/0210 b/test/stdout/0210
index 2eedebd91e90349505ba7084ae6feaacbd76c843..6a2f71d6cdf11c1a8fc81fbbea44635018e33711 100644 (file)
--- a/test/stdout/0210
+++ b/test/stdout/0210
@@ -14,9 +14,9 @@ DATA
 345 Send it
 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
 345 Send it
 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>
 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.
 .
 
 This is a test message.
 .

diff --git a/test/stdout/0215 b/test/stdout/0215
index d6d06cfe6986cebeffe56e9a33fe78acfe5d7c90..a4a9b86399b07a869bb1e7ac76e919abde645201 100644 (file)
--- a/test/stdout/0215
+++ b/test/stdout/0215
@@ -18,9 +18,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
        (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>
 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.
 .
 
 This is a test message.
 .


@@ -53,9 +53,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.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@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 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.
 .
 
 This is a test message.
 .


@@ -93,9 +93,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        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@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmbA-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.
 .
 
 This is a test message.
 .


@@ -140,9 +140,9 @@ DATA
 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
 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmbC-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.
 .
 
 This is a test message.
 .


@@ -173,9 +173,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbE-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbE-0005vi-00; 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>
 Message-Id: <E10HmbE-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.
 .
 
 This is a test message.
 .


@@ -205,9 +205,9 @@ 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
 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 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.
 .
 
 This is a test message.
 .

diff --git a/test/stdout/0217 b/test/stdout/0217
index be5634b31cad47ec1365f7aa4fd2759bd49d4ff1..662e156fb20fa5808c64ec396bdafdbf29dc3fa3 100644 (file)
--- a/test/stdout/0217
+++ b/test/stdout/0217
@@ -21,9 +21,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK


@@ -310,9 +310,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbP-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbP-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000

+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbP-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmbP-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK

diff --git a/test/stdout/0218 b/test/stdout/0218
index c7f853fc5697f2a02d0656a113e98274b405309e..d26e24f480c4a113623f98ed73e613418767c35e 100644 (file)
--- a/test/stdout/0218
+++ b/test/stdout/0218
@@ -16,9 +16,9 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message 1
 .
 
 Message 1
 .


@@ -33,9 +33,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for b@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for b@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@test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message 2
 .
 
 Message 2
 .


@@ -82,9 +82,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbC-0005vi-00
        for c@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbC-0005vi-00
        for c@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>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message 3
 .
 
 Message 3
 .

diff --git a/test/stdout/0231 b/test/stdout/0231
index f74359cac64599fd5d329f858c1c0f019858a379..bd6eb49d8b8a9dea9315121208cc13b383a2546b 100644 (file)
--- a/test/stdout/0231
+++ b/test/stdout/0231
@@ -20,15 +20,15 @@ DATA
 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
 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-rewrite@domain2,
        b-rewrite@domain2, a@domain3, b@domain3
 To:       a@test.ex, b@test.ex, a-other@domain2,
        b-other@domain2, a@domain3, b@domain3
 Reply-to: a@test.ex, b@test.ex, a-other@domain2,
        b-other@domain2, a@domain3, b@domain3
 From:     a@test.ex, b@test.ex, a-rewrite@domain2,
        b-rewrite@domain2, a@domain3, b@domain3
 To:       a@test.ex, b@test.ex, a-other@domain2,
        b-other@domain2, a@domain3, b@domain3
 Reply-to: a@test.ex, b@test.ex, a-other@domain2,
        b-other@domain2, a@domain3, b@domain3

-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

 Sender: CALLER_NAME <CALLER@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK

diff --git a/test/stdout/0242 b/test/stdout/0242
index 7dc9a2e1b47e59efe21363d5904a9f28db253433..dbcbe94d995ec9d5e34d1fd81b52b8159885eb9e 100644 (file)
--- a/test/stdout/0242
+++ b/test/stdout/0242
@@ -15,9 +15,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for abc@x.y.z; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for abc@x.y.z; 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@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message
 .
 
 Test message
 .


@@ -40,10 +40,10 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for abc@x.y.z; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for abc@x.y.z; Tue, 2 Mar 1999 09:44:33 +0000

-Subject: Test message
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>

+Subject: Test message

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK

diff --git a/test/stdout/0245 b/test/stdout/0245
index 36332a61b6f811d33557fa334f6bd41b456d07eb..9bd0dfc25cd26d2de89fb4ebf57829b28db2e5ef 100644 (file)
--- a/test/stdout/0245
+++ b/test/stdout/0245
@@ -26,9 +26,9 @@ aaa@bbb
 dddP 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
 dddP 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

+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

 036T To: <"abc
    def"@test.ex>, xxx@yyy
 ddd* Bcc: aaa@bbb    
 036T To: <"abc
    def"@test.ex>, xxx@yyy
 ddd* Bcc: aaa@bbb    

-047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

 dddF From: CALLER_NAME <CALLER@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>

-038  Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/stdout/0250 b/test/stdout/0250
index 1d364b4e9b64bc114c44c1ae5bb7a776e21c354e..310f57896618f62869e7fd87956480abdfbbdd1b 100644 (file)
--- a/test/stdout/0250
+++ b/test/stdout/0250
@@ -20,14 +20,14 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER-rewritten@test.ex>)
        id 10HmaX-0005vi-00
        for SomeOne-rewritten@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER-rewritten@test.ex>)
        id 10HmaX-0005vi-00
        for SomeOne-rewritten@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

 ddd* From: userx@test.ex
 dddF From: userx-rewritten@test.ex
 ddd* From: userx@test.ex
 dddF From: userx-rewritten@test.ex

-047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

 ddd* X-rewrote-original-recipient: SomeOne@test.ex
 ddd* Sender: CALLER_NAME <CALLER@test.ex>
 dddS Sender: CALLER_NAME <CALLER-rewritten@test.ex>
 ddd* X-rewrote-sender: CALLER@test.ex
 ddd* X-rewrote-original-recipient: SomeOne@test.ex
 ddd* Sender: CALLER_NAME <CALLER@test.ex>
 dddS Sender: CALLER_NAME <CALLER-rewritten@test.ex>
 ddd* X-rewrote-sender: CALLER@test.ex

-038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 10HmaY-0005vi-00-H
 CALLER UID GID
 <CALLER-rewritten@test.ex>
 10HmaY-0005vi-00-H
 CALLER UID GID
 <CALLER-rewritten@test.ex>


@@ -50,14 +50,14 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER-rewritten@test.ex>)
        id 10HmaY-0005vi-00
        for OtherOne-rewritten@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER-rewritten@test.ex>)
        id 10HmaY-0005vi-00
        for OtherOne-rewritten@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>

 ddd* From: usery@test.ex
 dddF From: usery-rewritten@test.ex
 ddd* From: usery@test.ex
 dddF From: usery-rewritten@test.ex

-047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>

 ddd* X-rewrote-original-recipient: OtherOne@test.ex
 ddd* Sender: CALLER_NAME <CALLER@test.ex>
 dddS Sender: CALLER_NAME <CALLER-rewritten@test.ex>
 ddd* X-rewrote-sender: CALLER@test.ex
 ddd* X-rewrote-original-recipient: OtherOne@test.ex
 ddd* Sender: CALLER_NAME <CALLER@test.ex>
 dddS Sender: CALLER_NAME <CALLER-rewritten@test.ex>
 ddd* X-rewrote-sender: CALLER@test.ex

-038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 10HmaZ-0005vi-00-H
 CALLER UID GID
 <CALLER-rewritten@test.ex>
 10HmaZ-0005vi-00-H
 CALLER UID GID
 <CALLER-rewritten@test.ex>


@@ -80,9 +80,9 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER-rewritten@test.ex>)
        id 10HmaZ-0005vi-00
        for ThirdOne-rewritten@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER-rewritten@test.ex>)
        id 10HmaZ-0005vi-00
        for ThirdOne-rewritten@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 047I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 ddd* X-rewrote-original-recipient: ThirdOne@test.ex
 ddd* From: CALLER_NAME <CALLER@test.ex>
 dddF From: CALLER_NAME <CALLER-rewritten@test.ex>
 ddd* X-rewrote-sender: CALLER@test.ex
 047I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 ddd* X-rewrote-original-recipient: ThirdOne@test.ex
 ddd* From: CALLER_NAME <CALLER@test.ex>
 dddF From: CALLER_NAME <CALLER-rewritten@test.ex>
 ddd* X-rewrote-sender: CALLER@test.ex

-038  Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/stdout/0253 b/test/stdout/0253
index e289e817fb862695c7c8c9fab3df4a6225d20990..5165278db455ff0e9d3c938f157bb744104b660d 100644 (file)
--- a/test/stdout/0253
+++ b/test/stdout/0253
@@ -16,9 +16,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <pqr@x.y.z>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <pqr@x.y.z>)
        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: pqr@x.y.z
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: pqr@x.y.z

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message 3
 .
 
 Test message 3
 .


@@ -42,9 +42,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <pqr@x.y.z>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <pqr@x.y.z>)
        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: pqr@x.y.z
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: pqr@x.y.z

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Test message 3
 .
 
 Test message 3
 .

diff --git a/test/stdout/0254 b/test/stdout/0254
index 947c4e0c5660dcf99b01855b40e4274b037d21ec..3e044dd6f3123279ba067e33de9debee376c5d35 100644 (file)
--- a/test/stdout/0254
+++ b/test/stdout/0254
@@ -20,6 +20,7 @@ dddP 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
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+054I Resent-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

 ddd* From: f
 dddF From: f@myhost.test.ex
 ddd* To: t
 ddd* From: f
 dddF From: f@myhost.test.ex
 ddd* To: t


@@ -32,7 +33,6 @@ ddd* Resent-To: t
 028T Resent-To: t@myhost.test.ex
 015  Resent-Date: d
 033  Resent-Subject: should not exist
 028T Resent-To: t@myhost.test.ex
 015  Resent-Date: d
 033  Resent-Subject: should not exist

-054I Resent-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

 dddS Resent-Sender: CALLER_NAME <CALLER@myhost.test.ex>
 10HmaY-0005vi-00-H
 CALLER UID GID
 dddS Resent-Sender: CALLER_NAME <CALLER@myhost.test.ex>
 10HmaY-0005vi-00-H
 CALLER UID GID


@@ -56,13 +56,13 @@ dddP 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
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+045  Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000
+054I Resent-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>

 ddd* From: f
 dddF From: f@myhost.test.ex
 ddd* Resent-From: f
 dddF Resent-From: f@myhost.test.ex
 ddd* From: f
 dddF From: f@myhost.test.ex
 ddd* Resent-From: f
 dddF Resent-From: f@myhost.test.ex

-054I Resent-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>

 dddS Resent-Sender: CALLER_NAME <CALLER@myhost.test.ex>
 dddS Resent-Sender: CALLER_NAME <CALLER@myhost.test.ex>

-045  Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000

 10HmaZ-0005vi-00-H
 CALLER UID GID
 <CALLER@myhost.test.ex>
 10HmaZ-0005vi-00-H
 CALLER UID GID
 <CALLER@myhost.test.ex>


@@ -85,6 +85,8 @@ dddP 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
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+045  Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000
+054I Resent-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>

 ddd* From: userx
 dddF From: userx@myhost.test.ex
 ddd* To: xx@yy
 ddd* From: userx
 dddF From: userx@myhost.test.ex
 ddd* To: xx@yy


@@ -93,6 +95,4 @@ ddd* Resent-From: userx
 dddF Resent-From: userx@myhost.test.ex
 ddd* Resent-To: xx@yy
 021T Resent-To: xxxx@yyyy
 dddF Resent-From: userx@myhost.test.ex
 ddd* Resent-To: xx@yy
 021T Resent-To: xxxx@yyyy

-054I Resent-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>

 dddS Resent-Sender: CALLER_NAME <CALLER@myhost.test.ex>
 dddS Resent-Sender: CALLER_NAME <CALLER@myhost.test.ex>

-045  Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/stdout/0285 b/test/stdout/0285
index 37a681a08e5cd7721a28d8603b9d5f875cbf915a..84ba5b55074b871fd6d0431b8a73be522d32f189 100644 (file)
--- a/test/stdout/0285
+++ b/test/stdout/0285
@@ -17,9 +17,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK


@@ -42,9 +42,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK


@@ -68,9 +68,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK


@@ -93,9 +93,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK


@@ -119,9 +119,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK

diff --git a/test/stdout/0286 b/test/stdout/0286
index 993817efaef92d36f9154ccb9b78ec9bc63d8801..e65518e57145aea2ed3152133400427d1471c1f3 100644 (file)
--- a/test/stdout/0286
+++ b/test/stdout/0286
@@ -17,9 +17,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK


@@ -47,9 +47,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK


@@ -62,9 +62,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK


@@ -96,9 +96,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK


@@ -130,9 +130,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK

diff --git a/test/stdout/0288 b/test/stdout/0288
index 8f36a023d9679820c503941cb4a16a9311631f88..5c1cf83e046131392ea4dc608738b93790e04a82 100644 (file)
--- a/test/stdout/0288
+++ b/test/stdout/0288
@@ -16,9 +16,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK

diff --git a/test/stdout/0299 b/test/stdout/0299
index 798f402e6ef368ba85abefbe7eacd6dbf9ec173c..7f74352b9a636b6636cae11e4379194dcd9c2409 100644 (file)
--- a/test/stdout/0299
+++ b/test/stdout/0299
@@ -17,9 +17,9 @@ DATA
 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
 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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK


@@ -32,9 +32,9 @@ DATA
 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
 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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK

diff --git a/test/stdout/0311 b/test/stdout/0311
index 45190072f2fb0d1e7b1ae2a37fede3d495d18310..8641c1a6c2d29f1993bf277cedc2bb1b700ac031 100644 (file)
--- a/test/stdout/0311
+++ b/test/stdout/0311
@@ -20,12 +20,12 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for xx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for xx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

 ddd* return-path: x@y
 ddd* Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 ddd* envelope-to: p@q
 ddd* return-path: x@y
 ddd* Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 ddd* envelope-to: p@q

-047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

 dddF From: CALLER_NAME <CALLER@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>

-038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 10HmaY-0005vi-00-H
 CALLER UID GID
 <CALLER@myhost.test.ex>
 10HmaY-0005vi-00-H
 CALLER UID GID
 <CALLER@myhost.test.ex>


@@ -48,9 +48,9 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for xx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for xx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+038  Date: Tue, 2 Mar 1999 09:44:33 +0000
+047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>

 017  return-path: x@y
 ddd* Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 ddd* envelope-to: p@q
 017  return-path: x@y
 ddd* Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 ddd* envelope-to: p@q

-047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>

 dddF From: CALLER_NAME <CALLER@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>

-038  Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/stdout/0332 b/test/stdout/0332
index d1593fa4ec8202904cb0286e20ca60cf8a682a72..91787967fe3d89bb42a7c8f5728a7b1dc0252a21 100644 (file)
--- a/test/stdout/0332
+++ b/test/stdout/0332
@@ -17,9 +17,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for ok@no.delay; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for ok@no.delay; 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@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message 1
 .
 
 Message 1
 .


@@ -33,9 +33,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message 2
 .
 
 Message 2
 .

diff --git a/test/stdout/0333 b/test/stdout/0333
index d1593fa4ec8202904cb0286e20ca60cf8a682a72..91787967fe3d89bb42a7c8f5728a7b1dc0252a21 100644 (file)
--- a/test/stdout/0333
+++ b/test/stdout/0333
@@ -17,9 +17,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for ok@no.delay; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for ok@no.delay; 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@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message 1
 .
 
 Message 1
 .


@@ -33,9 +33,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex 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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Message 2
 .
 
 Message 2
 .

diff --git a/test/stdout/0338 b/test/stdout/0338
index a977513538b19e23a5135da5ef3351674156d39d..ca25c66ffc755e7e19ed5418ab4ac73c3c20988b 100644 (file)
--- a/test/stdout/0338
+++ b/test/stdout/0338
@@ -25,6 +25,6 @@ dddP Received: from CALLER by myhost.test.ex 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
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@test.ex>
 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@test.ex>

-038  Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/stdout/0363 b/test/stdout/0363
index a3160693fd5b48aca9c1170022395d10a8bc14ca..44397685ac82b15fda02f5785dd871729ccb277b 100644 (file)
--- a/test/stdout/0363
+++ b/test/stdout/0363
@@ -15,10 +15,10 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for Aa%Bb@Cc; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for Aa%Bb@Cc; Tue, 2 Mar 1999 09:44:33 +0000

-To: aa%bb@cc
+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>

+To: aa%bb@cc

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK

diff --git a/test/stdout/0367 b/test/stdout/0367
index b54aff8ffb51961ece05139ea678501d943b167d..6036dac9aeb47819006a4b4e445541997f1e0b8f 100644 (file)
--- a/test/stdout/0367
+++ b/test/stdout/0367
@@ -16,9 +16,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
        (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>
 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
 .
 
 Test message 1
 .


@@ -33,9 +33,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@domain1; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
        for userx@domain1; 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>
 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 message 4
 .
 
 Test message 4
 .


@@ -50,9 +50,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@domain1; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
        for userx@domain1; 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>
 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 3
 .
 
 Test message 3
 .


@@ -67,9 +67,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@domain1; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for userx@domain1; 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>
 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 2
 .
 
 Test message 2
 .

diff --git a/test/stdout/0374 b/test/stdout/0374
index f9844eb3b0f3d13de82971717896bf91fdbac427..7b3bd443d2ed0640212e607124b12f9172c6ce83 100644 (file)
--- a/test/stdout/0374
+++ b/test/stdout/0374
@@ -14,9 +14,9 @@ DATA
 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
 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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK

diff --git a/test/stdout/0375 b/test/stdout/0375
index 6e0080d5bdd1ecfc77c9f25b17ec41533e2eed53..5555ddb0ddfd6583d749827f814c5df30cf08ce8 100644 (file)
--- a/test/stdout/0375
+++ b/test/stdout/0375
@@ -14,9 +14,9 @@ DATA
 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
 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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK


@@ -73,9 +73,9 @@ DATA
 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
 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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK

diff --git a/test/stdout/0377 b/test/stdout/0377
index 59742e66692ad878471ef73f7f054c4e5794f78a..5e3c1dd4edf297f8f2d7133ded3091d94e9a5215 100644 (file)
--- a/test/stdout/0377
+++ b/test/stdout/0377
@@ -22,6 +22,6 @@ cccc@myhost.test.ex
 dddP 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
 dddP 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

+038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>
 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>

-038  Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/stdout/0378 b/test/stdout/0378
index e64fdef167c632a45d725025c691f5b63b74acd5..39d447a451ed513a8637158f314b80c7c9501a2d 100644 (file)
--- a/test/stdout/0378
+++ b/test/stdout/0378
@@ -21,6 +21,6 @@ dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for aaaa@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for aaaa@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>
 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>

-038  Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/stdout/0379 b/test/stdout/0379
index 7bfea116f33cf4d4766adf89ac1bf6d6d21529cb..d19ba85a168cfb0f02e6544559df135c30506a2a 100644 (file)
--- a/test/stdout/0379
+++ b/test/stdout/0379
@@ -21,6 +21,6 @@ aaaa@myhost.test.ex
 dddP 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
 dddP 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

+038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>
 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>

-038  Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/stdout/0389 b/test/stdout/0389
index 69b1bfc001239c4cf1748b58d2274655e4f34c9b..e3e357dd26f9611f06df39eb4140ea24b5508bd6 100644 (file)
--- a/test/stdout/0389
+++ b/test/stdout/0389
@@ -27,6 +27,6 @@ dddP Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

+038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>
 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>

-038  Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/stdout/0431 b/test/stdout/0431
index 5e17ec9d61b61d3bab3fe87b921c104af8beff13..49a01f0033a6d86e29bee054542cdc075cd030e2 100644 (file)
--- a/test/stdout/0431
+++ b/test/stdout/0431
@@ -16,9 +16,9 @@ DATA
 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
 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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK


@@ -41,9 +41,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.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@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK

diff --git a/test/stdout/0440 b/test/stdout/0440
index 7433e27b437c3b74848f46bdc70a53437ec46bf0..095cf71fceea4039f47e9b7ef6481aea3e64607a 100644 (file)
--- a/test/stdout/0440
+++ b/test/stdout/0440
@@ -15,9 +15,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for x1@y1; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for x1@y1; 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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 First message
 .
 
 First message
 .


@@ -32,9 +32,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for x3@y3; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for x3@y3; 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>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Third message
 .
 
 Third message
 .


@@ -49,9 +49,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for x2@y2; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for x2@y2; 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>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Second message
 .
 
 Second message
 .

diff --git a/test/stdout/0461 b/test/stdout/0461
index 16c0f34e61d51b1afb3da96e8c8ce8052bcce4dc..2b6000e3fbbe988cc02257e06e1a69ef91250423 100644 (file)
--- a/test/stdout/0461
+++ b/test/stdout/0461
@@ -15,9 +15,9 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Short message
 .
 
 Short message
 .


@@ -40,9 +40,9 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Short message
 .
 
 Short message
 .


@@ -65,9 +65,9 @@ Received: from CALLER by myhost.test.ex 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
        (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@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Short message
 .
 
 Short message
 .

diff --git a/test/stdout/0467 b/test/stdout/0467
index 553dda850a64d286c90bbe4f3900c7bafe5e085e..9610b5dd069c17cc7cf6e72f8a11217840eea417 100644 (file)
--- a/test/stdout/0467
+++ b/test/stdout/0467
@@ -34,9 +34,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for x@srv27.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for x@srv27.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>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK

diff --git a/test/stdout/0474 b/test/stdout/0474
index ee42c1e3262553ecd11b6563ffaddac93a9bbd2a..3b852fea250f183402b24f461925321e09746449 100644 (file)
--- a/test/stdout/0474
+++ b/test/stdout/0474
@@ -24,9 +24,9 @@ Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@the.local.host.name>)
        id 10HmaX-0005vi-00
        for abcd@xyz; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@the.local.host.name>)
        id 10HmaX-0005vi-00
        for abcd@xyz; 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>
 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 data.
 .
 
 Test data.
 .

diff --git a/test/stdout/0488 b/test/stdout/0488
index ff89ff2f76ca37f74db9c2bd7b85c5e645c4d6cc..4f7635181e06a74f4329110d345543f3cfbc2346 100644 (file)
--- a/test/stdout/0488
+++ b/test/stdout/0488
@@ -25,9 +25,9 @@ dddP Received: from CALLER by myhost.test.ex with local-smtp (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
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>
 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>

-038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 011  X-1: first
 012  X-2: second
 011  X-3: third
 011  X-1: first
 012  X-2: second
 011  X-3: third

diff --git a/test/stdout/0490 b/test/stdout/0490
index f9cb83d19b1edf81523dfda6d2d95f000bc91261..b9d5d3762c797d7f383f0b5243cc499b45f4c45e 100644 (file)
--- a/test/stdout/0490
+++ b/test/stdout/0490
@@ -29,6 +29,6 @@ dddP Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for bb@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for bb@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>
 047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <CALLER@myhost.test.ex>

-038  Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/stdout/0495 b/test/stdout/0495
index 35df989f52d130dcd8458cf94baebba790ed4122..874b217fb1425f40d27e2a2868809cc8cf4d9794 100644 (file)
--- a/test/stdout/0495
+++ b/test/stdout/0495
@@ -39,9 +39,9 @@ DATA
 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
 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>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This should succeed
 .
 
 This should succeed
 .


@@ -113,9 +113,9 @@ 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
 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 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 should succeed (alias to normal address)
 .
 
 This should succeed (alias to normal address)
 .


@@ -140,9 +140,9 @@ Received: from CALLER (helo=a.b)
        by myhost.test.ex with local-esmtp (Exim x.yz)
        (envelope-from <sen@der>)
        id 10HmbJ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
        by myhost.test.ex with local-esmtp (Exim x.yz)
        (envelope-from <sen@der>)
        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>
 From: sen@der
 Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
 From: sen@der

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This should succeed.
 .
 
 This should succeed.
 .

diff --git a/test/stdout/0497 b/test/stdout/0497
index 3462fd1b349e872d1d3a6a7405a729eb92c00bb3..7d078592e7e5e1910d77b811211f3b0eb1ce5141 100644 (file)
--- a/test/stdout/0497
+++ b/test/stdout/0497
@@ -61,9 +61,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@x.y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbD-0005vi-00
        for userx@x.y; 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>
 Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 452 temporary error
 
 .
 452 temporary error


@@ -129,9 +129,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbL-0005vi-00
        for userx@x.y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbL-0005vi-00
        for userx@x.y; Tue, 2 Mar 1999 09:44:33 +0000

+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmbL-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmbL-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 452 temporary error
 
 .
 452 temporary error

diff --git a/test/stdout/0498 b/test/stdout/0498
index f1448ba45eb8f4c56538a854072c166a43e7328f..deedca63a6c15e5e4921a4f8a7c58e89f8258edf 100644 (file)
--- a/test/stdout/0498
+++ b/test/stdout/0498
@@ -30,9 +30,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@x.y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@x.y; 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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 *sleep 2
 
 .
 *sleep 2

diff --git a/test/stdout/0514 b/test/stdout/0514
index 83111ea92dce253162246b367ace186850f78a4f..82f8ca6e568c34cf20357490c73745efd2cbe3e6 100644 (file)
--- a/test/stdout/0514
+++ b/test/stdout/0514
@@ -23,6 +23,6 @@ dddP Received: from "spaced user" by myhost.test.ex with local (Exim x.yz)
        (envelope-from <"spaced user"@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <"spaced user"@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000

+038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <"spaced user"@myhost.test.ex>
 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: CALLER_NAME <"spaced user"@myhost.test.ex>

-038  Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/stdout/0531 b/test/stdout/0531
index 01438bd3582a3595c5cf0d5cc49206b6692b71bb..b6fb5443718b2acbe9e484a7ed3c9f23e2e5045e 100644 (file)
--- a/test/stdout/0531
+++ b/test/stdout/0531
@@ -17,9 +17,9 @@ DATA
 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
 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>
 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.
 .
 
 This is a test message.
 .


@@ -44,9 +44,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@retry.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for userx@retry.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>
 Message-Id: <E10HmaZ-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.
 .
 
 This is a test message.
 .


@@ -70,9 +70,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@retry.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for userx@retry.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>
 Message-Id: <E10HmaZ-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.
 .
 
 This is a test message.
 .

diff --git a/test/stdout/0542 b/test/stdout/0542
index ab29dc9c0cff36a3e81061c475e52127a06f60b4..6a860f0d96413c88854f433033474af754b49756 100644 (file)
--- a/test/stdout/0542
+++ b/test/stdout/0542
@@ -30,11 +30,11 @@
 > message_body_linecount=2
 > max_received_linelength=50
 > headers -----------------
 > message_body_linecount=2
 > max_received_linelength=50
 > headers -----------------

-> From: A Person <a.person@a.domain.tld>
+> Date: Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+From: A Person <a.person@a.domain.tld>

 To: First <first@test.ex>, Second <second@test.ex>
 Subject: The subject is moot
 To: First <first@test.ex>, Second <second@test.ex>
 Subject: The subject is moot

-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000

 > 
 > body --------------------
 > And now we have the body of the message, containing a small number of lines. 
 > 
 > body --------------------
 > And now we have the body of the message, containing a small number of lines. 

diff --git a/test/stdout/0543 b/test/stdout/0543
index 6b6a6067fe99f63223480ffd4ded4cc2ad251a4e..b14cfff7789608465182a2e2da3c47cdea19c3ed 100644 (file)
--- a/test/stdout/0543
+++ b/test/stdout/0543
@@ -31,9 +31,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
        (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>
 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
 .
 
 Test message 1
 .

diff --git a/test/stdout/0554 b/test/stdout/0554
index 8c0cfea8abd33098537c89380b7ee2164c4ef646..c00390d9082fce92c7136f2a7a175df50780f0bf 100644 (file)
--- a/test/stdout/0554
+++ b/test/stdout/0554
@@ -31,9 +31,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for x@y; 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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK

diff --git a/test/stdout/0560 b/test/stdout/0560
index 45a84cf1398f97e214f2d7c4379a8af5143fd737..e2893572ece6df2f11104a1653998a53583114e1 100644 (file)
--- a/test/stdout/0560
+++ b/test/stdout/0560
@@ -2,12 +2,12 @@ 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
        (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: Somebody <abcd@x.y.z>
 To: first@test.ex
     another@another.ex
 Subject: Testing -Mvc
 From: Somebody <abcd@x.y.z>
 To: first@test.ex
     another@another.ex
 Subject: Testing -Mvc

-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>

 Sender: CALLER_NAME <CALLER@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 This is a test message of no great importance.
 
 This is a test message of no great importance.

diff --git a/test/stdout/2021 b/test/stdout/2021
index fad916638921a6fc6422879f0852adfd2fc947f6..dbed471750327123c42d4342b1199b7acd307d3f 100644 (file)
--- a/test/stdout/2021
+++ b/test/stdout/2021
@@ -33,9 +33,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for x@y; 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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK

diff --git a/test/stdout/3401 b/test/stdout/3401
index fda6814c59f20045bf3df23e2f330ee9cf163cfa..66b1dd3167cea297e700759858ea51c7e0024809 100644 (file)
--- a/test/stdout/3401
+++ b/test/stdout/3401
@@ -23,9 +23,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@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@domain.com; 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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK


@@ -51,9 +51,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@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for userx@domain.com; 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>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK


@@ -79,9 +79,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@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for userx@domain.com; 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>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK


@@ -141,9 +141,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbF-0005vi-00
        for forcesender@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbF-0005vi-00
        for forcesender@domain.com; 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>
 Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK


@@ -189,9 +189,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbI-0005vi-00
        for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbI-0005vi-00
        for userx@domain.com; 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>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK

diff --git a/test/stdout/3404 b/test/stdout/3404
index c78436c7122ac4fece6ba53847b13cd601fd88eb..90c228e79b6403c2448caf5720884b497eec80c7 100644 (file)
--- a/test/stdout/3404
+++ b/test/stdout/3404
@@ -19,9 +19,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@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@domain.com; 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>
 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-AID: >CALLER<
 
 .
 X-AID: >CALLER<
 
 .


@@ -48,9 +48,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@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for userx@domain.com; 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>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 X-AID: >zzz<
 
 .
 X-AID: >zzz<
 
 .


@@ -81,9 +81,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@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for userx@domain.com; 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>
 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 X-AID: >CALLER<
 
 .
 X-AID: >CALLER<
 
 .

diff --git a/test/stdout/3405 b/test/stdout/3405
index 6020e05913f2508f6af088a794059f1cf795fe51..15782630d0de47fad02b588e75c7107f8dd0f368 100644 (file)
--- a/test/stdout/3405
+++ b/test/stdout/3405
@@ -19,9 +19,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@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@domain.com; 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>
 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-AID: >CALLER<
 X-TAID: >CALLER<
 
 X-AID: >CALLER<
 X-TAID: >CALLER<
 


@@ -49,9 +49,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@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for userx@domain.com; 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>
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 X-AID: >CALLER<
 X-TAID: >CALLER<
 
 X-AID: >CALLER<
 X-TAID: >CALLER<
 

diff --git a/test/stdout/3412 b/test/stdout/3412
index b7c7a379faf15c7bf499a6054b1a10428d431531..7511f43fb4874c8afe949c59a5e21f30bd2da13a 100644 (file)
--- a/test/stdout/3412
+++ b/test/stdout/3412
@@ -18,13 +18,13 @@ DATA
 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
 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: x@test.ex
 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
 X-Failed-Recipients: x@test.ex
 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.
 
 
 This message was created automatically by mail delivery software.
 


@@ -41,9 +41,9 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for x@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for x@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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK

diff --git a/test/stdout/3415 b/test/stdout/3415
index 7bbd8061e836cf23066500a582a6e83df8d20b9e..7adb9f6f6e621b3530c2dc34dfac4e00f705af8a 100644 (file)
--- a/test/stdout/3415
+++ b/test/stdout/3415
@@ -165,10 +165,10 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
        (envelope-from <username@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <username@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

+038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: a@y
 dddS Sender: username@myhost.test.ex
 047I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 dddF From: a@y
 dddS Sender: username@myhost.test.ex

-038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 10HmaY-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <>
 10HmaY-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <>


@@ -190,9 +190,9 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
        by myhost.test.ex with esmtpa (Exim x.yz)
        id 10HmaY-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        by myhost.test.ex with esmtpa (Exim x.yz)
        id 10HmaY-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

+038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 dddF From: username@myhost.test.ex
 047I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 dddF From: username@myhost.test.ex

-038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 10HmaZ-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <>
 10HmaZ-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <>


@@ -214,9 +214,9 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
        by myhost.test.ex with esmtpa (Exim x.yz)
        id 10HmaZ-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        by myhost.test.ex with esmtpa (Exim x.yz)
        id 10HmaZ-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

+038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 047I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 dddF From: username@another.domain
 047I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 dddF From: username@another.domain

-038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 10HmbA-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <>
 10HmbA-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <>


@@ -238,9 +238,9 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
        by myhost.test.ex with esmtpa (Exim x.yz)
        id 10HmbA-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        by myhost.test.ex with esmtpa (Exim x.yz)
        id 10HmbA-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

+038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 047I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 dddF From: username@auth.id.domain
 047I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 dddF From: username@auth.id.domain

-038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 10HmbB-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <>
 10HmbB-0005vi-00-H
 EXIMUSER EXIM_UID EXIM_GID
 <>


@@ -262,7 +262,7 @@ dddP Received: from [127.0.0.1] (helo=rhu.barb)
        by myhost.test.ex with esmtpa (Exim x.yz)
        id 10HmbB-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
        by myhost.test.ex with esmtpa (Exim x.yz)
        id 10HmbB-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000

-dddF From: abc@x.y.z
+038  Date: Tue, 2 Mar 1999 09:44:33 +0000

 047I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
 047I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>

+dddF From: abc@x.y.z

 dddS Sender: username@auth.id.domain
 dddS Sender: username@auth.id.domain

-038  Date: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/stdout/3501 b/test/stdout/3501
index e29d425ffc3eb5a5413cb50acf06cec26714e8b1..aec3f5def17306f56921338c0cafe52629bfaa6b 100644 (file)
--- a/test/stdout/3501
+++ b/test/stdout/3501
@@ -21,9 +21,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@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@domain.com; 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>
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 .
 250 OK
 
 .
 250 OK

diff --git a/test/stdout/5102 b/test/stdout/5102
index 372019227481ad67826e16b3673f1aea39f48990..c0054572e774531d2e44d265b6d955e45c5d6df4 100644 (file)
--- a/test/stdout/5102
+++ b/test/stdout/5102
@@ -15,9 +15,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
        (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>
 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.
 .
 
 This is a test message.
 .


@@ -69,9 +69,9 @@ DATA
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        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@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Message-Id: <E10HmbA-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
 .
 
 This is a test message
 .

diff --git a/test/stdout/9900 b/test/stdout/9900
index 129eb3ce588fd9788fbbca4f8661d34edceedc19..98701f9a24316963cb47c31250cb25feac7a800b 100644 (file)
--- a/test/stdout/9900
+++ b/test/stdout/9900
@@ -24,9 +24,9 @@ Received: from CALLER by myhost.text.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@mx46cd.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@mx46cd.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.text.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaX-0005vi-00@myhost.text.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 First message
 .
 
 First message
 .


@@ -50,9 +50,9 @@ Received: from CALLER by myhost.text.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for userx@mx46cd.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for userx@mx46cd.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.text.ex>
 From: CALLER_NAME <CALLER@test.ex>
 Message-Id: <E10HmaY-0005vi-00@myhost.text.ex>
 From: CALLER_NAME <CALLER@test.ex>

-Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 Second message
 .
 
 Second message
 .