summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2005-01-12 14:23:28 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2005-01-12 14:23:28 +0000
commit14d57970fcd2647a0a225f1c8a7704a2c5340505 (patch)
treeb204b9af519cb186ff3615229863c28efcaa4d56 /src
parent3e11c26bcb99479c8bea9fab9acc71878666f278 (diff)
Restrict control=no_mbox-unspool to those ACLs that receive messages.
Diffstat (limited to 'src')
-rw-r--r--src/src/acl.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/src/acl.c b/src/src/acl.c
index dc3951221..fbc622374 100644
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/acl.c,v 1.14 2005/01/12 12:51:55 ph10 Exp $ */
+/* $Cambridge: exim/src/src/acl.c,v 1.15 2005/01/12 14:23:28 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -417,7 +417,9 @@ static unsigned int control_forbids[] = {
(1<<ACL_WHERE_PREDATA)),
#ifdef WITH_CONTENT_SCAN
- (1<<ACL_WHERE_NOTSMTP), /* no_mbox_unspool */
+ (unsigned int)
+ ~((1<<ACL_WHERE_MAIL)|(1<<ACL_WHERE_RCPT)| /* no_mbox_unspool */
+ (1<<ACL_WHERE_PREDATA)|(1<<ACL_WHERE_DATA)),
#endif
(unsigned int)