ph10 2005/01/12 12:24:13 GMT
Modified files:
exim-src/src acl.c spool_in.c
Log:
(1) The flags in acl.c for fakereject allowed it in too many places. It
is now allowed only when receiving a message. (2) There was a redundant
setting of fake_reject=FALSE in spool_in.c.
Revision Changes Path
1.13 +3 -1 exim/exim-src/src/acl.c
1.5 +0 -1 exim/exim-src/src/spool_in.c
Index: acl.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/acl.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- acl.c 4 Jan 2005 11:01:33 -0000 1.12
+++ acl.c 12 Jan 2005 12:24:13 -0000 1.13
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/acl.c,v 1.12 2005/01/04 11:01:33 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/acl.c,v 1.13 2005/01/12 12:24:13 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -405,7 +405,9 @@
#ifdef WITH_CONTENT_SCAN
(1<<ACL_WHERE_NOTSMTP), /* no_mbox_unspool */
#endif
- (1<<ACL_WHERE_NOTSMTP), /* fakereject */
+
+ ~((1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)| /* fakereject */
+ (1<<ACL_WHERE_PREDATA)|(1<<ACL_WHERE_DATA)),
(1<<ACL_WHERE_NOTSMTP) /* no_multiline */
};
Index: spool_in.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/spool_in.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- spool_in.c 4 Jan 2005 10:00:42 -0000 1.4
+++ spool_in.c 12 Jan 2005 12:24:13 -0000 1.5
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/spool_in.c,v 1.4 2005/01/04 10:00:42 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/spool_in.c,v 1.5 2005/01/12 12:24:13 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -284,7 +284,6 @@
#endif
#ifdef WITH_CONTENT_SCAN
-fake_reject = FALSE;
spam_score_int = NULL;
#endif
