Backport from BEE

[bacula/bacula] / bacula / src / dird / ua_acl.c

diff --git a/bacula/src/dird/ua_acl.c b/bacula/src/dird/ua_acl.c
index c510df6062da27dca551863ce38f26b9c21d778c..4b703741fa545b5ab029b3efe312be3d2c1dab72 100644 (file)
--- a/bacula/src/dird/ua_acl.c
+++ b/bacula/src/dird/ua_acl.c
@@ -1,29 +1,17 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2004-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
 
-   The main author of Bacula is Kern Sibbald, with contributions from
-   many others, a complete list can be found in the file AUTHORS.
-   This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version three of the GNU Affero General Public
-   License as published by the Free Software Foundation and included
-   in the file LICENSE.
+   The main author of Bacula is Kern Sibbald, with contributions from many
+   others, a complete list can be found in the file AUTHORS.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
+   You may use this file and others of this release according to the
+   license defined in the LICENSE file, which includes the Affero General
+   Public License, v3.0 ("AGPLv3") and some additional permissions and
+   terms pursuant to its AGPLv3 Section 7.
 
    Bacula® is a registered trademark of Kern Sibbald.
-   The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
-   Switzerland, email:ftf@fsfeurope.org.
 */
 /*
  *
@@ -31,7 +19,6 @@
  *
  *     Kern Sibbald, January MMIV
  *
- *   Version  $Id$
  */
 
 #include "bacula.h"
@@ -83,3 +70,27 @@ bool acl_access_ok(UAContext *ua, int acl, const char *item, int len)
    }
    return false;
 }
+
+/*
+ * Return  true if we have a restriction on the ACL
+ *        false if there is no ACL restriction
+ */
+bool have_restricted_acl(UAContext *ua, int acl)
+{
+   alist *list;
+
+   /* If no console resource => default console and all is permitted */
+   if (!ua || !ua->cons) {
+      return false;       /* no restrictions */
+   }
+
+   list = ua->cons->ACL_lists[acl];
+   if (!list) {
+      return false;
+   }
+   /* Special case *all* gives full access */
+   if (list->size() == 1 && strcasecmp("*all*", (char *)list->get(0)) == 0) {
+      return false;
+   }
+   return list->size() > 0;
+}