diff options
| author | Nigel Metheringham <nigel@exim.org> | 2009-11-23 13:04:49 +0000 |
|---|---|---|
| committer | Nigel Metheringham <nigel@exim.org> | 2009-11-23 13:04:49 +0000 |
| commit | 2709ca2632f61d2ebcdf5ef2040b5b7068fd6a96 (patch) | |
| tree | 1c037000872700130581122844fb5022aba25d2d /test/stdout | |
| parent | e00aaee32157c44b9fc3175ed0d2a5b3ea376d66 (diff) | |
Correct header sorting for testsuite. Required manual patching, so maybe errors. Fixes: #919
Diffstat (limited to 'test/stdout')
67 files changed, 161 insertions, 161 deletions
diff --git a/test/stdout/0015 b/test/stdout/0015 index d82e3cbc9..d4c476794 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmbE-0005vi-00@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmbG-0005vi-00@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 More text. . diff --git a/test/stdout/0033 b/test/stdout/0033 index 82aa1e93e..5df5759d1 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0035 b/test/stdout/0035 index 6b5928b77..c80d9fd9d 100644 --- 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 +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 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 <> @@ -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 -047I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> 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> @@ -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 -ddd* Sender: sender@some.where +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 047I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> +ddd* Sender: sender@some.where 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> @@ -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 -dddS Sender: sender@some.where +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 047I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex> +dddS Sender: sender@some.where 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> @@ -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 -ddd* Sender: sender@some.where +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 047I Message-Id: <E10HmbD-0005vi-00@myhost.test.ex> +ddd* Sender: sender@some.where 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 603298279..4c8bdd5c2 100644 --- 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: ------------------------------------------------ -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: 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 diff --git a/test/stdout/0093 b/test/stdout/0093 index 4762c64ac..236300048 100644 --- 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: 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\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: +++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 diff --git a/test/stdout/0100 b/test/stdout/0100 index f4c25d7e5..5d260e735 100644 --- 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 -..dotheader: This is perfectly legal +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmbD-0005vi-00@the.local.host.name> +..dotheader: This is perfectly legal From: CALLER_NAME <CALLER@test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 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 -..dotheader: This is perfectly legal +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmbM-0005vi-00@the.local.host.name> +..dotheader: This is perfectly legal From: CALLER_NAME <CALLER@test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 A message containing .. a line starting with a dot diff --git a/test/stdout/0101 b/test/stdout/0101 index c5e6a37c3..aeda5eb54 100644 --- 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 -..dotheader: This is perfectly legal +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmbB-0005vi-00@the.local.host.name> +..dotheader: This is perfectly legal From: CALLER_NAME <CALLER@test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 A message containing .. a line starting with a dot diff --git a/test/stdout/0143 b/test/stdout/0143 index 1075fed7f..32e92d513 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0163 b/test/stdout/0163 index 8e8832381..bd377b1ff 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 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 f558f08d2..af69f2b2c 100644 --- 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 -Subject: freeze this (3) +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmbG-0005vi-00@the.local.host.name> +Subject: freeze this (3) From: CALLER_NAME <CALLER@test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a third message to be frozen. . diff --git a/test/stdout/0179 b/test/stdout/0179 index 9013698df..50583d25c 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0185 b/test/stdout/0185 index dba278f72..a7122b1d6 100644 --- 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 -Subject: freeze this +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +Subject: freeze this From: CALLER_NAME <CALLER@test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a message to be frozen. . diff --git a/test/stdout/0190 b/test/stdout/0190 index 66bd28c1c..fa9ad7c5a 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message . @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message . @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message . @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaY-0005vi-00@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message . @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaY-0005vi-00@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message . @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message . diff --git a/test/stdout/0200 b/test/stdout/0200 index 77b589ba5..cb6431636 100644 --- 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 b311e114c..a59fabdbf 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 1 . diff --git a/test/stdout/0209 b/test/stdout/0209 index 90a59b259..238adf062 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 1 . diff --git a/test/stdout/0210 b/test/stdout/0210 index 2eedebd91..6a2f71d6c 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. . diff --git a/test/stdout/0215 b/test/stdout/0215 index d6d06cfe6..a4a9b8639 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. . @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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. . @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmbE-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmbF-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. . diff --git a/test/stdout/0217 b/test/stdout/0217 index be5634b31..662e156fb 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 diff --git a/test/stdout/0218 b/test/stdout/0218 index c7f853fc5..d26e24f48 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 . @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 . @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 . diff --git a/test/stdout/0231 b/test/stdout/0231 index f74359cac..bd6eb49d8 100644 --- 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 +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 -Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> Sender: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0242 b/test/stdout/0242 index 7dc9a2e1b..dbcbe94d9 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 . @@ -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 -Subject: Test message +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +Subject: Test message From: CALLER_NAME <CALLER@test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0245 b/test/stdout/0245 index 36332a61b..9bd0dfc25 100644 --- 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 +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 -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/0250 b/test/stdout/0250 index 1d364b4e9..310f57896 100644 --- 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 +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 -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 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 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 +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 -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 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 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 +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 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0253 b/test/stdout/0253 index e289e817f..5165278db 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 . @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 . diff --git a/test/stdout/0254 b/test/stdout/0254 index 947c4e0c5..3e044dd6f 100644 --- 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 +054I Resent-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> 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 -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 @@ -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 +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 -054I Resent-Message-Id: <E10HmaY-0005vi-00@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> @@ -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 +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 @@ -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 -054I Resent-Message-Id: <E10HmaZ-0005vi-00@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 37a681a08..84ba5b550 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 diff --git a/test/stdout/0286 b/test/stdout/0286 index 993817efa..e65518e57 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 diff --git a/test/stdout/0288 b/test/stdout/0288 index 8f36a023d..5c1cf83e0 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 diff --git a/test/stdout/0299 b/test/stdout/0299 index 798f402e6..7f74352b9 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0311 b/test/stdout/0311 index 45190072f..8641c1a6c 100644 --- 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 +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 -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 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 +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 -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/0332 b/test/stdout/0332 index d1593fa4e..91787967f 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 . @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 . diff --git a/test/stdout/0333 b/test/stdout/0333 index d1593fa4e..91787967f 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 . @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 . diff --git a/test/stdout/0338 b/test/stdout/0338 index a97751353..ca25c66ff 100644 --- 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 +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> -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0363 b/test/stdout/0363 index a3160693f..44397685a 100644 --- 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 -To: aa%bb@cc +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@the.local.host.name> +To: aa%bb@cc From: CALLER_NAME <CALLER@test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0367 b/test/stdout/0367 index b54aff8ff..6036dac9a 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 1 . @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmbA-0005vi-00@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaY-0005vi-00@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 2 . diff --git a/test/stdout/0374 b/test/stdout/0374 index f9844eb3b..7b3bd443d 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0375 b/test/stdout/0375 index 6e0080d5b..5555ddb0d 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0377 b/test/stdout/0377 index 59742e666..5e3c1dd4e 100644 --- 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 +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> -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0378 b/test/stdout/0378 index e64fdef16..39d447a45 100644 --- 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 +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> -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0379 b/test/stdout/0379 index 7bfea116f..d19ba85a1 100644 --- 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 +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> -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0389 b/test/stdout/0389 index 69b1bfc00..e3e357dd2 100644 --- 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 +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> -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0431 b/test/stdout/0431 index 5e17ec9d6..49a01f003 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0440 b/test/stdout/0440 index 7433e27b4..095cf71fc 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 Second message . diff --git a/test/stdout/0461 b/test/stdout/0461 index 16c0f34e6..2b6000e3f 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 . @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 . @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 . diff --git a/test/stdout/0467 b/test/stdout/0467 index 553dda850..9610b5dd0 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0474 b/test/stdout/0474 index ee42c1e32..3b852fea2 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@the.local.host.name> From: CALLER_NAME <CALLER@the.local.host.name> -Date: Tue, 2 Mar 1999 09:44:33 +0000 Test data. . diff --git a/test/stdout/0488 b/test/stdout/0488 index ff89ff2f7..4f7635181 100644 --- 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 +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> -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 011 X-1: first 012 X-2: second 011 X-3: third diff --git a/test/stdout/0490 b/test/stdout/0490 index f9cb83d19..b9d5d3762 100644 --- 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 +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> -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0495 b/test/stdout/0495 index 35df989f5..874b217fb 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmbD-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex> From: sen@der -Date: Tue, 2 Mar 1999 09:44:33 +0000 This should succeed. . diff --git a/test/stdout/0497 b/test/stdout/0497 index 3462fd1b3..7d078592e 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmbD-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 diff --git a/test/stdout/0498 b/test/stdout/0498 index f1448ba45..deedca63a 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . *sleep 2 diff --git a/test/stdout/0514 b/test/stdout/0514 index 83111ea92..82f8ca6e5 100644 --- 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 +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> -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/stdout/0531 b/test/stdout/0531 index 01438bd35..b6fb54437 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. . @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. . diff --git a/test/stdout/0542 b/test/stdout/0542 index ab29dc9c0..6a860f0d9 100644 --- a/test/stdout/0542 +++ b/test/stdout/0542 @@ -30,11 +30,11 @@ > 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 -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. diff --git a/test/stdout/0543 b/test/stdout/0543 index 6b6a6067f..b14cfff77 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@the.local.host.name> From: CALLER_NAME <CALLER@test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 Test message 1 . diff --git a/test/stdout/0554 b/test/stdout/0554 index 8c0cfea8a..c00390d90 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/0560 b/test/stdout/0560 index 45a84cf13..e2893572e 100644 --- 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 +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 -Message-Id: <E10HmaX-0005vi-00@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. diff --git a/test/stdout/2021 b/test/stdout/2021 index fad916638..dbed47175 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/3401 b/test/stdout/3401 index fda6814c5..66b1dd316 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmbF-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 diff --git a/test/stdout/3404 b/test/stdout/3404 index c78436c71..90c228e79 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 X-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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 X-AID: >CALLER< . diff --git a/test/stdout/3405 b/test/stdout/3405 index 6020e0591..15782630d 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 X-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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 X-AID: >CALLER< X-TAID: >CALLER< diff --git a/test/stdout/3412 b/test/stdout/3412 index b7c7a379f..7511f43fb 100644 --- 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 +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 -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. @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/3415 b/test/stdout/3415 index 7bbd8061e..7adb9f6f6 100644 --- 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 +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 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 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 +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 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 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 +038 Date: Tue, 2 Mar 1999 09:44:33 +0000 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 <> @@ -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 +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 -038 Date: Tue, 2 Mar 1999 09:44:33 +0000 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 -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> +dddF From: abc@x.y.z 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 e29d425ff..aec3f5def 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 . 250 OK diff --git a/test/stdout/5102 b/test/stdout/5102 index 372019227..c0054572e 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message. . @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> -Date: Tue, 2 Mar 1999 09:44:33 +0000 This is a test message . diff --git a/test/stdout/9900 b/test/stdout/9900 index 129eb3ce5..98701f9a2 100644 --- 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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 . @@ -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 +Date: Tue, 2 Mar 1999 09:44:33 +0000 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 . |