summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/src/acl.c6
-rw-r--r--src/src/spool_in.c3
2 files changed, 5 insertions, 4 deletions
diff --git a/src/src/acl.c b/src/src/acl.c
index 14fd2a072..843a9ad26 100644
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/acl.c,v 1.12 2005/01/04 11:01:33 ph10 Exp $ */
+/* $Cambridge: 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 @@ static unsigned int control_forbids[] = {
#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 */
};
diff --git a/src/src/spool_in.c b/src/src/spool_in.c
index 8c1b27e2a..aca1b131b 100644
--- a/src/src/spool_in.c
+++ b/src/src/spool_in.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/spool_in.c,v 1.4 2005/01/04 10:00:42 ph10 Exp $ */
+/* $Cambridge: 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 @@ tls_peerdn = NULL;
#endif
#ifdef WITH_CONTENT_SCAN
-fake_reject = FALSE;
spam_score_int = NULL;
#endif