Disallow queue= modifier from DATA ACL
authorJeremy Harris <jgh146exb@wizmail.org>
Tue, 31 May 2016 17:28:17 +0000 (18:28 +0100)
committerJeremy Harris <jgh146exb@wizmail.org>
Tue, 31 May 2016 17:28:34 +0000 (18:28 +0100)
doc/doc-docbook/spec.xfpt
src/src/acl.c

index 15491c3..174873d 100644 (file)
@@ -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.
index ec1505b..0972a23 100644 (file)
@@ -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)