Compiler quietening: C fn ptrs are officially not intercastable with object pointers

[exim.git] / src / src / acl.c

diff --git a/src/src/acl.c b/src/src/acl.c
index 7284831a6ef881952d4a1c184329b7d83d6157a7..13cda1ab479865f1b1a78bc1e83e55307dd96fe2 100644 (file)
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -1022,8 +1022,8 @@ for (p = q; *p; p = q)
   if (!*hptr)
     {
     /* The header_line struct itself is not tainted, though it points to
-    tainted data. */
-    header_line *h = store_get(sizeof(header_line), FALSE);
+    possibly tainted data. */
+    header_line * h = store_get(sizeof(header_line), FALSE);
     h->text = hdr;
     h->next = NULL;
     h->type = newtype;
@@ -3590,6 +3590,12 @@ for (; cb; cb = cb->next)
     #endif
 
     case ACLC_QUEUE:
+    if (is_tainted(arg))
+      {
+      *log_msgptr = string_sprintf("Tainted name '%s' for queue not permitted",
+                                   arg);
+      return ERROR;
+      }
     if (Ustrchr(arg, '/'))
       {
       *log_msgptr = string_sprintf(