diff options
author | Jeremy Harris <jgh146exb@wizmail.org> | 2018-01-01 13:14:41 +0000 |
---|---|---|
committer | Jeremy Harris <jgh146exb@wizmail.org> | 2018-01-01 17:10:23 +0000 |
commit | c11d665dab975691024f9231ad93c65bef7e5df4 (patch) | |
tree | ac2a5701c6511c08266c4fb122e71a481a73bfc2 /test/rejectlog | |
parent | adf73d3717be93cdbbb38c7e2e4bb0531d1cca27 (diff) |
Feature macros, show-supported and build-time selection for malware interfaces
Diffstat (limited to 'test/rejectlog')
-rw-r--r-- | test/rejectlog/4002 | 48 | ||||
-rw-r--r-- | test/rejectlog/4006 | 4 | ||||
-rw-r--r-- | test/rejectlog/4007 | 24 | ||||
-rw-r--r-- | test/rejectlog/4008 (renamed from test/rejectlog/4005) | 26 | ||||
-rw-r--r-- | test/rejectlog/4009 (renamed from test/rejectlog/4004) | 0 | ||||
-rw-r--r-- | test/rejectlog/4010 (renamed from test/rejectlog/4003) | 0 | ||||
-rw-r--r-- | test/rejectlog/4011 | 38 | ||||
-rw-r--r-- | test/rejectlog/4012 | 12 | ||||
-rw-r--r-- | test/rejectlog/4013 (renamed from test/rejectlog/4001) | 12 | ||||
-rw-r--r-- | test/rejectlog/4014 (renamed from test/rejectlog/4016) | 9 |
10 files changed, 81 insertions, 92 deletions
diff --git a/test/rejectlog/4002 b/test/rejectlog/4002 deleted file mode 100644 index 16c708986..000000000 --- a/test/rejectlog/4002 +++ /dev/null @@ -1,48 +0,0 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA -Envelope-from: <CALLER@myhost.test.ex> -Envelope-to: <userx@test.ex> -P Received: from CALLER (helo=test.ex) - by myhost.test.ex with local-esmtp (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 - Subject: defer this one (daemon tmp-err) -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> -F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA -Envelope-from: <CALLER@myhost.test.ex> -Envelope-to: <userx@test.ex> -P Received: from CALLER (helo=test.ex) - by myhost.test.ex with local-esmtp (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 - Date: Tue, 2 Mar 1999 09:44:33 +0000 - Subject: message should be rejected (virus found) -I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> -F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA -Envelope-from: <CALLER@myhost.test.ex> -Envelope-to: <userx@test.ex> -P Received: from CALLER (helo=test.ex) - by myhost.test.ex with local-esmtp (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 - Date: Tue, 2 Mar 1999 09:44:33 +0000 - Subject: message should be deferred due to timeout -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> -F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmbC-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA -Envelope-from: <CALLER@myhost.test.ex> -Envelope-to: <userx@test.ex> -P Received: from CALLER (helo=test.ex) - by myhost.test.ex with local-esmtp (Exim x.yz) - (envelope-from <CALLER@myhost.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 - Subject: message should be rejected (virus found) -I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex> -F From: CALLER_NAME <CALLER@myhost.test.ex> diff --git a/test/rejectlog/4006 b/test/rejectlog/4006 index 6ba3a2659..f9626e35a 100644 --- a/test/rejectlog/4006 +++ b/test/rejectlog/4006 @@ -7,7 +7,7 @@ P Received: from CALLER (helo=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 - Subject: defer this one, the scanner had an error + Subject: defer this one due to scanner error I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> 1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA @@ -31,6 +31,6 @@ P Received: from CALLER (helo=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 - Subject: message should be tmp-rejected due to timeout + Subject: defer this one due to timeout I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> diff --git a/test/rejectlog/4007 b/test/rejectlog/4007 index 2c4463ad0..6ba3a2659 100644 --- a/test/rejectlog/4007 +++ b/test/rejectlog/4007 @@ -1,24 +1,36 @@ -1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA +Envelope-from: <CALLER@myhost.test.ex> +Envelope-to: <userx@test.ex> +P Received: from CALLER (helo=test.ex) + by myhost.test.ex with local-esmtp (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 + Subject: defer this one, the scanner had an error +I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +F From: CALLER_NAME <CALLER@myhost.test.ex> +1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaZ-0005vi-00 + 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 Subject: message should be rejected -I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA +1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + 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 Subject: message should be tmp-rejected due to timeout -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> diff --git a/test/rejectlog/4005 b/test/rejectlog/4008 index f9626e35a..2c4463ad0 100644 --- a/test/rejectlog/4005 +++ b/test/rejectlog/4008 @@ -1,36 +1,24 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA -Envelope-from: <CALLER@myhost.test.ex> -Envelope-to: <userx@test.ex> -P Received: from CALLER (helo=test.ex) - by myhost.test.ex with local-esmtp (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 - Subject: defer this one due to scanner error -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> -F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmbA-0005vi-00 + 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 Subject: message should be rejected -I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA +1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + 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 - Subject: defer this one due to timeout -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> + Subject: message should be tmp-rejected due to timeout +I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> diff --git a/test/rejectlog/4004 b/test/rejectlog/4009 index 5aad09639..5aad09639 100644 --- a/test/rejectlog/4004 +++ b/test/rejectlog/4009 diff --git a/test/rejectlog/4003 b/test/rejectlog/4010 index fbe3b69f0..fbe3b69f0 100644 --- a/test/rejectlog/4003 +++ b/test/rejectlog/4010 diff --git a/test/rejectlog/4011 b/test/rejectlog/4011 index adeded6fb..16c708986 100644 --- a/test/rejectlog/4011 +++ b/test/rejectlog/4011 @@ -1,24 +1,48 @@ -1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaZ-0005vi-00 + 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 - Subject: message should be rejected -I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> + Subject: defer this one (daemon tmp-err) +I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA +1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + 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 + Subject: message should be rejected (virus found) +I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> +F From: CALLER_NAME <CALLER@myhost.test.ex> +1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA +Envelope-from: <CALLER@myhost.test.ex> +Envelope-to: <userx@test.ex> +P Received: from CALLER (helo=test.ex) + by myhost.test.ex with local-esmtp (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 Date: Tue, 2 Mar 1999 09:44:33 +0000 Subject: message should be deferred due to timeout -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +F From: CALLER_NAME <CALLER@myhost.test.ex> +1999-03-02 09:44:33 10HmbC-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +Envelope-from: <CALLER@myhost.test.ex> +Envelope-to: <userx@test.ex> +P Received: from CALLER (helo=test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from <CALLER@myhost.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 + Subject: message should be rejected (virus found) +I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> diff --git a/test/rejectlog/4012 b/test/rejectlog/4012 index bd26ac2a4..8ec883c54 100644 --- a/test/rejectlog/4012 +++ b/test/rejectlog/4012 @@ -10,3 +10,15 @@ P Received: from CALLER (helo=test.ex) Subject: message should be rejected I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> +1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA +Envelope-from: <CALLER@myhost.test.ex> +Envelope-to: <userx@test.ex> +P Received: from CALLER (helo=test.ex) + by myhost.test.ex with local-esmtp (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 + Date: Tue, 2 Mar 1999 09:44:33 +0000 + Subject: message should be deferred due to timeout +I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +F From: CALLER_NAME <CALLER@myhost.test.ex> diff --git a/test/rejectlog/4001 b/test/rejectlog/4013 index 8ec883c54..adeded6fb 100644 --- a/test/rejectlog/4001 +++ b/test/rejectlog/4013 @@ -1,24 +1,24 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaX-0005vi-00 + 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 Subject: message should be rejected -I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> -1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA +1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> P Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) - id 10HmaY-0005vi-00 + 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 Subject: message should be deferred due to timeout -I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> +I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> diff --git a/test/rejectlog/4016 b/test/rejectlog/4014 index c477c0534..bd26ac2a4 100644 --- a/test/rejectlog/4016 +++ b/test/rejectlog/4014 @@ -1,11 +1,12 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: Found Eicar-Test-Signature +1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA Envelope-from: <CALLER@myhost.test.ex> Envelope-to: <userx@test.ex> -P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) +P Received: from CALLER (helo=test.ex) + by myhost.test.ex with local-esmtp (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 - Subject: a virus test + Date: Tue, 2 Mar 1999 09:44:33 +0000 + Subject: message should be rejected 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 |