Big backport from Enterprise

[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 4b703741fa545b5ab029b3efe312be3d2c1dab72..5396b1ad0925e5da96f33de1aa7c0303402c7a8d 100644 (file)
--- a/bacula/src/dird/ua_acl.c
+++ b/bacula/src/dird/ua_acl.c
@@ -1,24 +1,25 @@
 /*
-   Bacula® - The Network Backup Solution
+   Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2004-2014 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2017 Kern Sibbald
 
-   The main author of Bacula is Kern Sibbald, with contributions from many
-   others, a complete list can be found in the file AUTHORS.
+   The original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
 
    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.
+   This notice must be preserved when any source code is
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
 */
 /*
- *
  *   Bacula Director -- User Agent Access Control List (ACL) handling
  *
  *     Kern Sibbald, January MMIV
- *
  */
 
 #include "bacula.h"
@@ -32,6 +33,28 @@ bool acl_access_ok(UAContext *ua, int acl, const char *item)
    return acl_access_ok(ua, acl, item, strlen(item));
 }
 
+bool acl_access_client_ok(UAContext *ua, const char *name, int32_t jobtype)
+{
+   if (acl_access_ok(ua, Client_ACL, name)) {
+      return true;
+   }
+   if (jobtype == JT_BACKUP && acl_access_ok(ua, BackupClient_ACL, name)) {
+      return true;
+   }
+   if (jobtype == JT_RESTORE && acl_access_ok(ua, RestoreClient_ACL, name)) {
+      return true;
+   }
+   /* Some commands such as "status client" are for both Backup and Restore */
+   if (jobtype == JT_BACKUP_RESTORE &&
+       (acl_access_ok(ua, RestoreClient_ACL, name) ||
+        acl_access_ok(ua, BackupClient_ACL, name)))
+   {
+      return true;
+   }
+   return false;
+}
+
+
 
 /* This version expects the length of the item which we must check. */
 bool acl_access_ok(UAContext *ua, int acl, const char *item, int len)