From 2709ca2632f61d2ebcdf5ef2040b5b7068fd6a96 Mon Sep 17 00:00:00 2001 From: Nigel Metheringham Date: Mon, 23 Nov 2009 13:04:49 +0000 Subject: Correct header sorting for testsuite. Required manual patching, so maybe errors. Fixes: #919 --- test/rejectlog/0021 | 10 +++++----- test/rejectlog/0026 | 18 +++++++++--------- test/rejectlog/0027 | 12 ++++++------ test/rejectlog/0028 | 2 +- test/rejectlog/0181 | 4 ++-- test/rejectlog/0220 | 2 +- test/rejectlog/0221 | 2 +- test/rejectlog/0365 | 16 ++++++++-------- test/rejectlog/0451 | 4 ++-- test/rejectlog/0465 | 4 ++-- test/rejectlog/0468 | 4 ++-- test/rejectlog/0490 | 2 +- test/rejectlog/0505 | 4 ++-- test/rejectlog/0507 | 12 ++++++------ test/rejectlog/0536 | 4 ++-- test/rejectlog/0539 | 2 +- 16 files changed, 51 insertions(+), 51 deletions(-) (limited to 'test/rejectlog') diff --git a/test/rejectlog/0021 b/test/rejectlog/0021 index edfe63fe9..04c1f3a94 100644 --- 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 ) 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: F From: userx@test1 - Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmaY-0005vi-00 F= rejected by non-SMTP ACL: cannot test hosts condition in non-SMTP ACL Envelope-from: Envelope-to: @@ -15,9 +15,9 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) 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: F From: ok@test2 - Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmaZ-0005vi-00 F= rejected by non-SMTP ACL: no verified certificate Envelope-from: Envelope-to: @@ -25,9 +25,9 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) 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: 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 1999-03-02 09:44:33 mail accepted "mail from:" "" @@ -42,9 +42,9 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) 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: F From: userx@test1 - Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmbB-0005vi-00 F= rejected by non-SMTP ACL: don't like sender userx@test1 Envelope-from: Envelope-to: @@ -52,8 +52,8 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) 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: 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: SIZE=ssss" " SIZE=1234" diff --git a/test/rejectlog/0026 b/test/rejectlog/0026 index 716e35cf0..2d97471f9 100644 --- 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 ) id 10HmaX-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -F From: @ -I Message-Id: Date: Tue, 2 Mar 1999 09:44:33 +0000 +I Message-Id: +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: 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: , @ -I Message-Id: Date: Tue, 2 Mar 1999 09:44:33 +0000 +I Message-Id: +F From: , @ 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: 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: -I Message-Id: Date: Tue, 2 Mar 1999 09:44:33 +0000 +I Message-Id: +F From: X-warning: this is a test warning 1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F= rejected after DATA: body contains trigger Envelope-from: @@ -34,17 +34,17 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) 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: 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: 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: T to: group name: x@y, p@q; R reply-to: group name:; -I Message-Id: - Date: Tue, 2 Mar 1999 09:44:33 +0000 X-warning: this is a test warning diff --git a/test/rejectlog/0027 b/test/rejectlog/0027 index 9a9421433..bff8a746c 100644 --- a/test/rejectlog/0027 +++ b/test/rejectlog/0027 @@ -13,24 +13,24 @@ Envelope-to: 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: Date: Tue, 2 Mar 1999 09:44:33 +0000 +I Message-Id: + 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: 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: Date: Tue, 2 Mar 1999 09:44:33 +0000 +I Message-Id: + 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: 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: Date: Tue, 2 Mar 1999 09:44:33 +0000 +I Message-Id: + Subject: data3 diff --git a/test/rejectlog/0028 b/test/rejectlog/0028 index 32a9d0576..c1888ad68 100644 --- 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 ) 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: F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 U=CALLER F= rejected RCPT : SIZE value too big diff --git a/test/rejectlog/0181 b/test/rejectlog/0181 index ea4814552..47ca48209 100644 --- a/test/rejectlog/0181 +++ b/test/rejectlog/0181 @@ -1,12 +1,12 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 rejected from U=CALLER: message too big: read=225 max=100 Envelope-from: Envelope-to: + Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmaY-0005vi-00 rejected from U=CALLER: message too big: read=101 max=100 Envelope-from: Envelope-to: + Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0220 b/test/rejectlog/0220 index 0ea1b2a0b..f322fefc3 100644 --- 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: + Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0221 b/test/rejectlog/0221 index 0ea1b2a0b..f322fefc3 100644 --- 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: + Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0365 b/test/rejectlog/0365 index 5dbe6259a..30b7ac01f 100644 --- a/test/rejectlog/0365 +++ b/test/rejectlog/0365 @@ -4,18 +4,18 @@ Envelope-to: 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: Date: Tue, 2 Mar 1999 09:44:33 +0000 +I Message-Id: +F From: rejected after DATA: there is no valid sender in any header line Envelope-from: <> Envelope-to: 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: Date: Tue, 2 Mar 1999 09:44:33 +0000 +I Message-Id: +F From: bad@domain 1999-03-02 09:44:33 U=CALLER sender verify defer for : could not connect to V4NET.0.0.0 [V4NET.0.0.0]: Network Error 1999-03-02 09:44:33 U=CALLER F= temporarily rejected RCPT : Could not complete sender verify callout 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F= rejected after DATA @@ -25,18 +25,18 @@ P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for x@y; Tue, 2 Mar 1999 09:44:33 +0000 -F From: Date: Tue, 2 Mar 1999 09:44:33 +0000 +I Message-Id: +F From: rejected after DATA: there is no valid sender in any header line Envelope-from: <> Envelope-to: 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: -I Message-Id: Date: Tue, 2 Mar 1999 09:44:33 +0000 +I Message-Id: +F From: 1999-03-02 09:44:33 U=CALLER F= temporarily rejected RCPT : 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 : failure message 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT : defer message diff --git a/test/rejectlog/0451 b/test/rejectlog/0451 index e2616875e..ef3633778 100644 --- a/test/rejectlog/0451 +++ b/test/rejectlog/0451 @@ -6,9 +6,9 @@ P Received: from CALLER (helo=a.b.c.d) (envelope-from ) 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: F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F= rejected after DATA: Sender verify failed Envelope-from: Envelope-to: @@ -17,6 +17,6 @@ P Received: from CALLER (helo=a.b.c.d) (envelope-from ) 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: F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0465 b/test/rejectlog/0465 index cab143858..51402d1fa 100644 --- a/test/rejectlog/0465 +++ b/test/rejectlog/0465 @@ -4,6 +4,6 @@ Envelope-to: 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: Date: Tue, 2 Mar 1999 09:44:33 +0000 +I Message-Id: +T To: abc@xyz. diff --git a/test/rejectlog/0468 b/test/rejectlog/0468 index b2ece3e1f..c86cd555d 100644 --- 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 ) 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: F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F= rejected after DATA: message body message end Envelope-from: Envelope-to: @@ -15,6 +15,6 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) 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: F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0490 b/test/rejectlog/0490 index ef53406f4..47afbaa7c 100644 --- 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 ) 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: F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0505 b/test/rejectlog/0505 index 2c56b7f1e..dd1021153 100644 --- 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 ) 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: F From: CALLER_NAME - 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= rejected by non-SMTP ACL: cannot use "control=enforce_sync" in non-SMTP ACL Envelope-from: @@ -16,7 +16,7 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) 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: F From: CALLER_NAME - 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 diff --git a/test/rejectlog/0507 b/test/rejectlog/0507 index 957071a1f..28b2f5f7e 100644 --- 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 ) id 10HmaX-0005vi-00 for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000 -T To: a@b.c, himself + Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: +T To: a@b.c, himself F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F= rejected after DATA: bcc recipient detected Envelope-from: Envelope-to: @@ -16,10 +16,10 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@dom.com; Tue, 2 Mar 1999 09:44:33 +0000 -T To: a@b.c, himself + Date: Tue, 2 Mar 1999 09:44:33 +0000 I Message-Id: +T To: a@b.c, himself F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F= rejected after DATA: bcc recipient detected Envelope-from: Envelope-to: @@ -28,9 +28,9 @@ Envelope-to: P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 + Date: Tue, 2 Mar 1999 09:44:33 +0000 +I Message-Id: T To: a@b.c, himself * Cc: unqualified, userx@dom.com, x@y.z C Cc: unqualified@myhost.test.ex, userx@dom.com, x@y.z -I Message-Id: F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/0536 b/test/rejectlog/0536 index bf06473b6..d395838c7 100644 --- 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 ) 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: F From: user1@test.ex - Date: Tue, 2 Mar 1999 09:44:33 +0000 1999-03-02 09:44:33 10HmaY-0005vi-00 F= rejected by non-SMTP ACL: 599 Main code Envelope-from: Envelope-to: @@ -33,9 +33,9 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) 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: 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 : No code 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT : Main code 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT : Main and extended code diff --git a/test/rejectlog/0539 b/test/rejectlog/0539 index 74da8e6e1..6191a89fb 100644 --- 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 ) 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: F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 -- cgit v1.2.3