kes Fix Verify InitCatalog. The attributes were not pointing to the

[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 dcfc0e468a8d339c165bb1e634bd8c31f5123f47..7d5b686d5c9f4c3e165d236156cef8ce72b9f8e4 100644 (file)
--- a/bacula/src/dird/ua_acl.c
+++ b/bacula/src/dird/ua_acl.c
@@ -6,26 +6,33 @@
  *
  *   Version  $Id$
  */
-
 /*
-   Copyright (C) 2004-2005 Kern Sibbald
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2004-2006 Free Software Foundation Europe e.V.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   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 two of the GNU General Public
+   License as published by the Free Software Foundation plus additions
+   that are listed in the file LICENSE.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   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 General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   You should have received a copy of the GNU 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.
 
- */
+   Bacula® is a registered trademark of John Walker.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
 
 #include "bacula.h"
 #include "dird.h"
@@ -46,12 +53,15 @@ bool acl_access_ok(UAContext *ua, int acl, char *item, int len)
    /* If no console resource => default console and all is permitted */
    if (!ua->cons) {
       Dmsg0(1400, "Root cons access OK.\n");
-      return true;                   /* No cons resource -> root console OK for everything */
+      return true;                    /* No cons resource -> root console OK for everything */
    }
 
    alist *list = ua->cons->ACL_lists[acl];
-   if (!list) {
-      return false;                  /* List empty, reject everything */
+   if (!list) {                       /* empty list */
+      if (len == 0 && acl == Where_ACL) {
+         return true;                 /* Empty list for Where => empty where */
+      }
+      return false;                   /* List empty, reject everything */
    }
 
    /* Special case *all* gives full access */
@@ -63,7 +73,7 @@ bool acl_access_ok(UAContext *ua, int acl, char *item, int len)
    for (int i=0; i<list->size(); i++) {
       if (strcasecmp(item, (char *)list->get(i)) == 0) {
          Dmsg3(1400, "ACL found %s in %d %s\n", item, acl, (char *)list->get(i));
-        return true;
+         return true;
       }
    }
    return false;