ph10 2004/12/29 16:34:31 GMT
Modified files:
exim-src/src acl.c
exim-test-orig/AutoTest/confs 598
exim-test-orig/AutoTest/log 598
exim-test-orig/AutoTest/mail 598.ph10
exim-test-orig/AutoTest/scripts 598
Log:
The various Exiscan tests were locked out from the non-SMTP ACL, but
there is no reason why they should not be available (and they apparently
were available in the original patch).
Revision Changes Path
1.9 +7 -7 exim/exim-src/src/acl.c
1.2 +1 -0 exim/exim-test-orig/AutoTest/confs/598
1.4 +3 -0 exim/exim-test-orig/AutoTest/log/598
1.4 +24 -0 exim/exim-test-orig/AutoTest/mail/598.ph10
1.2 +6 -0 exim/exim-test-orig/AutoTest/scripts/598
Index: acl.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/acl.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- acl.c 29 Dec 2004 16:00:58 -0000 1.8
+++ acl.c 29 Dec 2004 16:34:31 -0000 1.9
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/acl.c,v 1.8 2004/12/29 16:00:58 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/acl.c,v 1.9 2004/12/29 16:34:31 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -220,7 +220,7 @@
(1<<ACL_WHERE_HELO),
#ifdef EXPERIMENTAL_BRIGHTMAIL
- (1<<ACL_WHERE_NOTSMTP)|(1<<ACL_WHERE_AUTH)| /* bmi_optin */
+ (1<<ACL_WHERE_AUTH)| /* bmi_optin */
(1<<ACL_WHERE_CONNECT)|(1<<ACL_WHERE_HELO)|
(1<<ACL_WHERE_DATA)|(1<<ACL_WHERE_MIME)|
(1<<ACL_WHERE_ETRN)|(1<<ACL_WHERE_EXPN)|
@@ -237,7 +237,7 @@
0, /* control */
#ifdef WITH_CONTENT_SCAN
- (1<<ACL_WHERE_NOTSMTP)|(1<<ACL_WHERE_AUTH)| /* decode */
+ (1<<ACL_WHERE_AUTH)| /* decode */
(1<<ACL_WHERE_CONNECT)|(1<<ACL_WHERE_HELO)|
(1<<ACL_WHERE_DATA)|(1<<ACL_WHERE_PREDATA)|
(1<<ACL_WHERE_ETRN)|(1<<ACL_WHERE_EXPN)|
@@ -249,7 +249,7 @@
0, /* delay */
#ifdef WITH_OLD_DEMIME
- (1<<ACL_WHERE_NOTSMTP)|(1<<ACL_WHERE_AUTH)| /* demime */
+ (1<<ACL_WHERE_AUTH)| /* demime */
(1<<ACL_WHERE_CONNECT)|(1<<ACL_WHERE_HELO)|
(1<<ACL_WHERE_RCPT)|(1<<ACL_WHERE_PREDATA)|
(1<<ACL_WHERE_ETRN)|(1<<ACL_WHERE_EXPN)|
@@ -285,7 +285,7 @@
0, /* logwrite */
#ifdef WITH_CONTENT_SCAN
- (1<<ACL_WHERE_NOTSMTP)|(1<<ACL_WHERE_AUTH)| /* malware */
+ (1<<ACL_WHERE_AUTH)| /* malware */
(1<<ACL_WHERE_CONNECT)|(1<<ACL_WHERE_HELO)|
(1<<ACL_WHERE_RCPT)|(1<<ACL_WHERE_PREDATA)|
(1<<ACL_WHERE_ETRN)|(1<<ACL_WHERE_EXPN)|
@@ -297,7 +297,7 @@
0, /* message */
#ifdef WITH_CONTENT_SCAN
- (1<<ACL_WHERE_NOTSMTP)|(1<<ACL_WHERE_AUTH)| /* mime_regex */
+ (1<<ACL_WHERE_AUTH)| /* mime_regex */
(1<<ACL_WHERE_CONNECT)|(1<<ACL_WHERE_HELO)|
(1<<ACL_WHERE_DATA)|(1<<ACL_WHERE_PREDATA)|
(1<<ACL_WHERE_ETRN)|(1<<ACL_WHERE_EXPN)|
@@ -315,7 +315,7 @@
(1<<ACL_WHERE_VRFY),
#ifdef WITH_CONTENT_SCAN
- (1<<ACL_WHERE_NOTSMTP)|(1<<ACL_WHERE_AUTH)| /* regex */
+ (1<<ACL_WHERE_AUTH)| /* regex */
(1<<ACL_WHERE_CONNECT)|(1<<ACL_WHERE_HELO)|
(1<<ACL_WHERE_RCPT)|(1<<ACL_WHERE_PREDATA)|
(1<<ACL_WHERE_ETRN)|(1<<ACL_WHERE_EXPN)|
@@ -339,7 +339,7 @@
0, /* set */
#ifdef WITH_CONTENT_SCAN
- (1<<ACL_WHERE_NOTSMTP)|(1<<ACL_WHERE_AUTH)| /* spam */
+ (1<<ACL_WHERE_AUTH)| /* spam */
(1<<ACL_WHERE_CONNECT)|(1<<ACL_WHERE_HELO)|
(1<<ACL_WHERE_RCPT)|(1<<ACL_WHERE_PREDATA)|
(1<<ACL_WHERE_ETRN)|(1<<ACL_WHERE_EXPN)|
Index: 598
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/598,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 598 20 Dec 2004 11:13:55 -0000 1.1
+++ 598 29 Dec 2004 16:34:31 -0000 1.2
@@ -13,6 +13,7 @@
acl_smtp_rcpt = check_rcpt
acl_smtp_data = check_data
+acl_not_smtp = check_data
acl_smtp_mime = check_mime
Index: 598
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/598,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 598 22 Dec 2004 12:05:46 -0000 1.3
+++ 598 29 Dec 2004 16:34:31 -0000 1.4
@@ -13,3 +13,6 @@
1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=4389 id=20041217133501.GA3058@???
1999-03-02 09:44:33 10HmbB-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= ph10@??? U=ph10 P=local S=964
+1999-03-02 09:44:33 10HmbC-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
+1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
Index: 598.ph10
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/598.ph10,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 598.ph10 22 Dec 2004 12:05:46 -0000 1.3
+++ 598.ph10 29 Dec 2004 16:34:31 -0000 1.4
@@ -251,3 +251,27 @@
--T4sUOijqQbZv57TR--
+From ph10@??? Tue Mar 02 09:44:33 1999
+Received: from ph10 by myhost.test.ex with local (Exim x.yz)
+ id 10HmbC-0005vi-00
+ for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbC-0005vi-00@???>
+From: Philip Hazel <ph10@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+X-Spam_score: 0.9
+X-Spam_score_int: 9
+X-Spam_bar: /
+X-Spam_report: Spam detection software, running on the system "xoanon.csi.cam.ac.uk", has
+ identified this incoming email as possible spam. The original message
+ has been attached to this so you can view it (if it isn't spam) or block
+ similar future email. If you have any questions, see
+ the administrator of that system for details.
+ Content preview: A message without any headers. [...]
+ Content analysis details: (0.9 points, 5.0 required)
+ pts rule name description
+ ---- ---------------------- --------------------------------------------------
+ 0.9 FROM_ENDS_IN_NUMS From: ends in numbers
+X-Router-SSint: 9
+
+A message without any headers.
+
Index: 598
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/598,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 598 20 Dec 2004 11:13:56 -0000 1.1
+++ 598 29 Dec 2004 16:34:31 -0000 1.2
@@ -117,3 +117,9 @@
.
quit
****
+# Non-smtp message
+0
+exim -odi ph10@???
+A message without any headers.
+.
+****
