From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 31 May 2016 17:28:17 +0000 (+0100)
Subject: Disallow queue= modifier from DATA ACL
X-Git-Tag: exim-4_88_RC1~84^2~1
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/ecc5f51aca286f528e46dade1cf50776e8e38d02

Disallow queue= modifier from DATA ACL
---

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 15491c3f1..174873d07 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -28619,6 +28619,8 @@ effect.
 .vitem &*queue*&&~=&~<&'text'&>
 This modifier specifies the use of a named queue for spool files
 for the message.
+It can only be used before the message is received (i.e. not in
+the DATA ACL).
 This could be used, for example, for known high-volume burst sources
 of traffic, or for quarantine of messages.
 Separate queue-runner processes will be needed for named queues.
diff --git a/src/src/acl.c b/src/src/acl.c
index ec1505bf0..0972a23fc 100644
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -513,7 +513,12 @@ static unsigned int cond_forbids[] = {
   ~(1<<ACL_WHERE_MIME),                            /* mime_regex */
   #endif
 
-  0,                                               /* queue */
+  (1<<ACL_WHERE_NOTSMTP)|                          /* queue */
+  #ifndef DISABLE_PRDR
+    (1<<ACL_WHERE_PRDR)|
+  #endif
+    (1<<ACL_WHERE_DATA),
+
   0,                                               /* ratelimit */
 
   (unsigned int)