From: Philip Hazel <ph10@hermes.cam.ac.uk>
Date: Wed, 12 Jan 2005 14:23:28 +0000 (+0000)
Subject: Restrict control=no_mbox-unspool to those ACLs that receive messages.
X-Git-Tag: exim-4_50~37
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=14d57970fcd2647a0a225f1c8a7704a2c5340505;p=exim.git

Restrict control=no_mbox-unspool to those ACLs that receive messages.
---

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)