libcli/security: remove unused sec_desc_del_sid()
[sharpe/samba-autobuild/.git] / libcli / security / privileges.c
index ca2b4fef8dc04a68294701ed90ab2a8534e56404..d2731c3dd05845151d298996740d14aae56a2fab 100644 (file)
@@ -6,6 +6,7 @@
    Copyright (C) Gerald (Jerry) Carter          2005
    Copyright (C) Michael Adam                  2007
    Copyright (C) Andrew Bartlett               2010
+   Copyright (C) Andrew Tridgell                2004
 
    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
  */
 
 #include "includes.h"
-
-const uint64_t se_priv_all         = SE_ALL_PRIVS;
-static const uint64_t se_priv_end  = SE_END;
-
-/* Define variables for all privileges so we can use the
-   uint64_t* in the various se_priv_XXX() functions */
-
-const uint64_t se_priv_none       = SE_NONE;
-const uint64_t se_machine_account = SE_MACHINE_ACCOUNT;
-const uint64_t se_print_operator  = SE_PRINT_OPERATOR;
-const uint64_t se_add_users       = SE_ADD_USERS;
-const uint64_t se_disk_operators  = SE_DISK_OPERATOR;
-const uint64_t se_remote_shutdown = SE_REMOTE_SHUTDOWN;
-const uint64_t se_restore         = SE_RESTORE;
-const uint64_t se_take_ownership  = SE_TAKE_OWNERSHIP;
-
-PRIVS privs[] = {
-#if 0  /* usrmgr will display these twice if you include them.  We don't
-          use them but we'll keep the bitmasks reserved in privileges.h anyways */
-
-       {SE_NETWORK_LOGON,      "SeNetworkLogonRight",          "Access this computer from network",       0x0},
-       {SE_INTERACTIVE_LOGON,  "SeInteractiveLogonRight",      "Log on locally",                          0x0},
-       {SE_BATCH_LOGON,        "SeBatchLogonRight",            "Log on as a batch job",                   0x0},
-       {SE_SERVICE_LOGON,      "SeServiceLogonRight",          "Log on as a service",                     0x0},
-#endif
-       {SE_MACHINE_ACCOUNT,    "SeMachineAccountPrivilege",    "Add machines to domain",                  SEC_PRIV_MACHINE_ACCOUNT},
-       {SE_TAKE_OWNERSHIP,     "SeTakeOwnershipPrivilege",     "Take ownership of files or other objects",SEC_PRIV_TAKE_OWNERSHIP},
-        {SE_BACKUP,             "SeBackupPrivilege",            "Back up files and directories",          SEC_PRIV_BACKUP},
-        {SE_RESTORE,            "SeRestorePrivilege",           "Restore files and directories",          SEC_PRIV_RESTORE},
-       {SE_REMOTE_SHUTDOWN,    "SeRemoteShutdownPrivilege",    "Force shutdown from a remote system",     SEC_PRIV_REMOTE_SHUTDOWN},
-
-       {SE_PRINT_OPERATOR,     "SePrintOperatorPrivilege",     "Manage printers",                         SEC_PRIV_PRINT_OPERATOR},
-       {SE_ADD_USERS,          "SeAddUsersPrivilege",          "Add users and groups to the domain",      SEC_PRIV_ADD_USERS},
-       {SE_DISK_OPERATOR,      "SeDiskOperatorPrivilege",      "Manage disk shares",                      SEC_PRIV_DISK_OPERATOR},
-
-       {SE_END, "", "", 0x0}
+#include "libcli/security/privileges.h"
+#include "libcli/security/privileges_private.h"
+#include "librpc/gen_ndr/security.h"
+
+/* The use of strcasecmp here is safe, all the comparison strings are ASCII */
+#undef strcasecmp
+
+#define NUM_SHORT_LIST_PRIVS 9
+
+static const struct {
+       enum sec_privilege luid;
+       uint64_t privilege_mask;
+       const char *name;
+       const char *description;
+} privs[] = {
+
+       {SEC_PRIV_MACHINE_ACCOUNT, SEC_PRIV_MACHINE_ACCOUNT_BIT,   "SeMachineAccountPrivilege", "Add machines to domain"},
+       {SEC_PRIV_TAKE_OWNERSHIP,  SEC_PRIV_TAKE_OWNERSHIP_BIT,    "SeTakeOwnershipPrivilege",    "Take ownership of files or other objects"},
+        {SEC_PRIV_BACKUP,          SEC_PRIV_BACKUP_BIT,            "SeBackupPrivilege",           "Back up files and directories"},
+        {SEC_PRIV_RESTORE,         SEC_PRIV_RESTORE_BIT,           "SeRestorePrivilege",          "Restore files and directories"},
+       {SEC_PRIV_REMOTE_SHUTDOWN, SEC_PRIV_REMOTE_SHUTDOWN_BIT,   "SeRemoteShutdownPrivilege", "Force shutdown from a remote system"},
+
+       {SEC_PRIV_PRINT_OPERATOR,  SEC_PRIV_PRINT_OPERATOR_BIT,  "SePrintOperatorPrivilege",    "Manage printers"},
+       {SEC_PRIV_ADD_USERS,       SEC_PRIV_ADD_USERS_BIT,       "SeAddUsersPrivilege",         "Add users and groups to the domain"},
+       {SEC_PRIV_DISK_OPERATOR,   SEC_PRIV_DISK_OPERATOR_BIT,   "SeDiskOperatorPrivilege",     "Manage disk shares"},
+       {SEC_PRIV_SECURITY,        SEC_PRIV_SECURITY_BIT,        "SeSecurityPrivilege", "System security"},
+
+
+       /* The list from here on is not displayed in the code from
+        * source3, and is after index NUM_SHORT_LIST_PRIVS for that
+        * reason */ 
+
+       {SEC_PRIV_SYSTEMTIME,
+        SEC_PRIV_SYSTEMTIME_BIT,
+        "SeSystemtimePrivilege",
+       "Set the system clock"},
+
+       {SEC_PRIV_SHUTDOWN,
+        SEC_PRIV_SHUTDOWN_BIT,
+        "SeShutdownPrivilege",
+       "Shutdown the system"},
+
+       {SEC_PRIV_DEBUG,
+        SEC_PRIV_DEBUG_BIT,
+        "SeDebugPrivilege",
+       "Debug processes"},
+
+       {SEC_PRIV_SYSTEM_ENVIRONMENT,
+        SEC_PRIV_SYSTEM_ENVIRONMENT_BIT,
+        "SeSystemEnvironmentPrivilege",
+       "Modify system environment"},
+
+       {SEC_PRIV_SYSTEM_PROFILE,
+        SEC_PRIV_SYSTEM_PROFILE_BIT,
+        "SeSystemProfilePrivilege",
+       "Profile the system"},
+
+       {SEC_PRIV_PROFILE_SINGLE_PROCESS,
+        SEC_PRIV_PROFILE_SINGLE_PROCESS_BIT,
+        "SeProfileSingleProcessPrivilege",
+       "Profile one process"},
+
+       {SEC_PRIV_INCREASE_BASE_PRIORITY,
+        SEC_PRIV_INCREASE_BASE_PRIORITY_BIT,
+        "SeIncreaseBasePriorityPrivilege",
+        "Increase base priority"},
+
+       {SEC_PRIV_LOAD_DRIVER,
+        SEC_PRIV_LOAD_DRIVER_BIT,
+        "SeLoadDriverPrivilege",
+       "Load drivers"},
+
+       {SEC_PRIV_CREATE_PAGEFILE,
+        SEC_PRIV_CREATE_PAGEFILE_BIT,
+        "SeCreatePagefilePrivilege",
+       "Create page files"},
+
+       {SEC_PRIV_INCREASE_QUOTA,
+        SEC_PRIV_INCREASE_QUOTA_BIT,
+        "SeIncreaseQuotaPrivilege",
+       "Increase quota"},
+
+       {SEC_PRIV_CHANGE_NOTIFY,
+        SEC_PRIV_CHANGE_NOTIFY_BIT,
+        "SeChangeNotifyPrivilege",
+       "Register for change notify"},
+
+       {SEC_PRIV_UNDOCK,
+        SEC_PRIV_UNDOCK_BIT,
+        "SeUndockPrivilege",
+       "Undock devices"},
+
+       {SEC_PRIV_MANAGE_VOLUME,
+        SEC_PRIV_MANAGE_VOLUME_BIT,
+        "SeManageVolumePrivilege",
+       "Manage system volumes"},
+
+       {SEC_PRIV_IMPERSONATE,
+        SEC_PRIV_IMPERSONATE_BIT,
+        "SeImpersonatePrivilege",
+       "Impersonate users"},
+
+       {SEC_PRIV_CREATE_GLOBAL,
+        SEC_PRIV_CREATE_GLOBAL_BIT,
+        "SeCreateGlobalPrivilege",
+       "Create global"},
+
+       {SEC_PRIV_ENABLE_DELEGATION,
+        SEC_PRIV_ENABLE_DELEGATION_BIT,
+        "SeEnableDelegationPrivilege",
+       "Enable Delegation"},
 };
 
-/***************************************************************************
- copy an uint64_t structure
-****************************************************************************/
-
-bool se_priv_copy( uint64_t *dst, const uint64_t *src )
-{
-       if ( !dst || !src )
-               return False;
-
-       memcpy( dst, src, sizeof(uint64_t) );
-
-       return True;
-}
-
-/***************************************************************************
- put all privileges into a mask
-****************************************************************************/
+/* These are rights, not privileges, and should not be confused.  The
+ * names are very similar, and they are quite similar in behaviour,
+ * but they are not to be enumerated as a system-wide list or have an
+ * LUID value */
+static const struct {
+       uint32_t right_mask;
+       const char *name;
+       const char *description;
+} rights[] = {
+       {LSA_POLICY_MODE_INTERACTIVE,
+        "SeInteractiveLogonRight",
+       "Interactive logon"},
+
+       {LSA_POLICY_MODE_NETWORK,
+        "SeNetworkLogonRight",
+       "Network logon"},
+
+       {LSA_POLICY_MODE_REMOTE_INTERACTIVE,
+        "SeRemoteInteractiveLogonRight",
+       "Remote Interactive logon"}
+};
 
-bool se_priv_put_all_privileges(uint64_t *privilege_mask)
+/*
+  return a privilege mask given a privilege id
+*/
+uint64_t sec_privilege_mask(enum sec_privilege privilege)
 {
        int i;
-       uint32 num_privs = count_all_privileges();
-
-       if (!se_priv_copy(privilege_mask, &se_priv_none)) {
-               return False;
-       }
-       for ( i=0; i<num_privs; i++ ) {
-               se_priv_add(privilege_mask, &privs[i].privilege_mask);
+       for (i=0;i<ARRAY_SIZE(privs);i++) {
+               if (privs[i].luid == privilege) {
+                       return privs[i].privilege_mask;
+               }
        }
-       return True;
-}
-
-/***************************************************************************
- combine 2 uint64_t structures and store the resulting set in mew_mask
-****************************************************************************/
-
-void se_priv_add( uint64_t *privilege_mask, const uint64_t *addpriv )
-{
-       *privilege_mask |= *addpriv;
-}
 
-/***************************************************************************
- remove one uint64_t sytucture from another and store the resulting set
- in mew_mask
-****************************************************************************/
-
-void se_priv_remove( uint64_t *privilege_mask, const uint64_t *removepriv )
-{
-       *privilege_mask &= ~*removepriv;
+       return 0;
 }
 
 /***************************************************************************
invert a given uint64_t and store the set in new_mask
put all valid privileges into a mask
 ****************************************************************************/
 
-static void se_priv_invert( uint64_t *new_mask, const uint64_t *privilege_mask )
+void se_priv_put_all_privileges(uint64_t *privilege_mask)
 {
-       uint64_t allprivs;
-
-       se_priv_copy( &allprivs, &se_priv_all );
-       se_priv_remove( &allprivs, privilege_mask );
-       se_priv_copy( new_mask, &allprivs );
-}
-
-/***************************************************************************
- check if 2 uint64_t structure are equal
-****************************************************************************/
-
-bool se_priv_equal( const uint64_t *privilege_mask1, const uint64_t *privilege_mask2 )
-{
-       return *privilege_mask1 == *privilege_mask2;
-}
-
-/***************************************************************************
- check if a uint64_t has any assigned privileges
-****************************************************************************/
-
-static bool se_priv_empty( const uint64_t *privilege_mask )
-{
-       uint64_t p1;
-
-       se_priv_copy( &p1, privilege_mask );
-
-       p1 &= se_priv_all;
+       int i;
 
-       return se_priv_equal( &p1, &se_priv_none );
+       *privilege_mask = 0;
+       for ( i=0; i<ARRAY_SIZE(privs); i++ ) {
+               *privilege_mask |= privs[i].privilege_mask;
+       }
 }
 
 /*********************************************************************
- Lookup the uint64_t value for a privilege name
+ Lookup the uint64_t bitmask value for a privilege name
 *********************************************************************/
 
 bool se_priv_from_name( const char *name, uint64_t *privilege_mask )
 {
        int i;
-
-       for ( i=0; !se_priv_equal(&privs[i].privilege_mask, &se_priv_end); i++ ) {
+       for ( i=0; i<ARRAY_SIZE(privs); i++ ) {
                if ( strequal( privs[i].name, name ) ) {
-                       se_priv_copy( privilege_mask, &privs[i].privilege_mask );
-                       return True;
+                       *privilege_mask = privs[i].privilege_mask;
+                       return true;
                }
        }
 
-       return False;
-}
-
-/***************************************************************************
- dump an uint64_t structure to the log files
-****************************************************************************/
-
-void dump_se_priv( int dbg_cl, int dbg_lvl, const uint64_t *privilege_mask )
-{
-       DEBUGADDC( dbg_cl, dbg_lvl,("uint64_t 0x%llx\n", (unsigned long long)*privilege_mask));
+       return false;
 }
 
-/****************************************************************************
- check if the privilege is in the privilege list
-****************************************************************************/
-
-bool is_privilege_assigned(const uint64_t *privileges,
-                          const uint64_t *check)
-{
-       uint64_t p1, p2;
-
-       if ( !privileges || !check )
-               return False;
-
-       /* everyone has privileges if you aren't checking for any */
-
-       if ( se_priv_empty( check ) ) {
-               DEBUG(1,("is_privilege_assigned: no privileges in check_mask!\n"));
-               return True;
-       }
-
-       se_priv_copy( &p1, check );
-
-       /* invert the uint64_t we want to check for and remove that from the
-          original set.  If we are left with the uint64_t we are checking
-          for then return True */
-
-       se_priv_invert( &p1, check );
-       se_priv_copy( &p2, privileges );
-       se_priv_remove( &p2, &p1 );
-
-       return se_priv_equal( &p2, check );
-}
-
-/****************************************************************************
- check if the privilege is in the privilege list
-****************************************************************************/
-
-static bool is_any_privilege_assigned( uint64_t *privileges, const uint64_t *check )
-{
-       uint64_t p1, p2;
-
-       if ( !privileges || !check )
-               return False;
-
-       /* everyone has privileges if you aren't checking for any */
-
-       if ( se_priv_empty( check ) ) {
-               DEBUG(1,("is_any_privilege_assigned: no privileges in check_mask!\n"));
-               return True;
-       }
-
-       se_priv_copy( &p1, check );
-
-       /* invert the uint64_t we want to check for and remove that from the
-          original set.  If we are left with the uint64_t we are checking
-          for then return True */
-
-       se_priv_invert( &p1, check );
-       se_priv_copy( &p2, privileges );
-       se_priv_remove( &p2, &p1 );
-
-       /* see if we have any bits left */
-
-       return !se_priv_empty( &p2 );
-}
-
-/*********************************************************************
- Generate the struct lsa_LUIDAttribute structure based on a bitmask
-*********************************************************************/
-
 const char* get_privilege_dispname( const char *name )
 {
        int i;
@@ -262,8 +222,7 @@ const char* get_privilege_dispname( const char *name )
                return NULL;
        }
 
-       for ( i=0; !se_priv_equal(&privs[i].privilege_mask, &se_priv_end); i++ ) {
-
+       for ( i=0; i<ARRAY_SIZE(privs); i++ ) {
                if ( strequal( privs[i].name, name ) ) {
                        return privs[i].description;
                }
@@ -272,95 +231,15 @@ const char* get_privilege_dispname( const char *name )
        return NULL;
 }
 
-/****************************************************************************
- initialise a privilege list and set the talloc context
- ****************************************************************************/
-
-/****************************************************************************
- Does the user have the specified privilege ?  We only deal with one privilege
- at a time here.
-*****************************************************************************/
-
-bool user_has_privileges(const struct security_token *token, const uint64_t *privilege_bit)
-{
-       if ( !token )
-               return False;
-
-       return is_privilege_assigned( &token->privilege_mask, privilege_bit );
-}
-
-/****************************************************************************
- Does the user have any of the specified privileges ?  We only deal with one privilege
- at a time here.
-*****************************************************************************/
-
-bool user_has_any_privilege(struct security_token *token, const uint64_t *privilege_mask)
-{
-       if ( !token )
-               return False;
-
-       return is_any_privilege_assigned( &token->privilege_mask, privilege_mask );
-}
-
 /*******************************************************************
- return the number of elements in the privlege array
+ return the number of elements in the 'short' privlege array (traditional source3 behaviour)
 *******************************************************************/
 
-int count_all_privileges( void )
-{
-       /*
-        * The -1 is due to the weird SE_END record...
-        */
-       return (sizeof(privs) / sizeof(privs[0])) - 1;
-}
-
-
-/*********************************************************************
- Generate the struct lsa_LUIDAttribute structure based on a bitmask
- The assumption here is that the privilege has already been validated
- so we are guaranteed to find it in the list.
-*********************************************************************/
-
-struct lsa_LUIDAttribute get_privilege_luid( uint64_t *privilege_mask )
-{
-       struct lsa_LUIDAttribute priv_luid;
-       int i;
-
-       ZERO_STRUCT( priv_luid );
-
-       for ( i=0; !se_priv_equal(&privs[i].privilege_mask, &se_priv_end); i++ ) {
-
-               if ( se_priv_equal( &privs[i].privilege_mask, privilege_mask ) ) {
-                       priv_luid.luid.low = privs[i].luid;
-                       priv_luid.luid.high = 0;
-                       break;
-               }
-       }
-
-       return priv_luid;
-}
-
-/****************************************************************************
- Convert a LUID to a named string
-****************************************************************************/
-
-const char *luid_to_privilege_name(const struct lsa_LUID *set)
+int num_privileges_in_short_list( void )
 {
-       int i;
-
-       if (set->high != 0)
-               return NULL;
-
-       for ( i=0; !se_priv_equal(&privs[i].privilege_mask, &se_priv_end); i++ ) {
-               if ( set->low == privs[i].luid ) {
-                       return privs[i].name;
-               }
-       }
-
-       return NULL;
+       return NUM_SHORT_LIST_PRIVS;
 }
 
-
 /****************************************************************************
  add a privilege to a privilege array
  ****************************************************************************/
@@ -371,10 +250,10 @@ static bool privilege_set_add(PRIVILEGE_SET *priv_set, struct lsa_LUIDAttribute
 
        /* we can allocate memory to add the new privilege */
 
-       new_set = TALLOC_REALLOC_ARRAY(priv_set->mem_ctx, priv_set->set, struct lsa_LUIDAttribute, priv_set->count + 1);
+       new_set = talloc_realloc(priv_set->mem_ctx, priv_set->set, struct lsa_LUIDAttribute, priv_set->count + 1);
        if ( !new_set ) {
                DEBUG(0,("privilege_set_add: failed to allocate memory!\n"));
-               return False;
+               return false;
        }
 
        new_set[priv_set->count].luid.high = set.luid.high;
@@ -384,74 +263,223 @@ static bool privilege_set_add(PRIVILEGE_SET *priv_set, struct lsa_LUIDAttribute
        priv_set->count++;
        priv_set->set = new_set;
 
-       return True;
+       return true;
 }
 
 /*******************************************************************
 *******************************************************************/
 
-bool se_priv_to_privilege_set( PRIVILEGE_SET *set, uint64_t *privilege_mask )
+bool se_priv_to_privilege_set( PRIVILEGE_SET *set, uint64_t privilege_mask )
 {
        int i;
-       uint32 num_privs = count_all_privileges();
        struct lsa_LUIDAttribute luid;
 
        luid.attribute = 0;
        luid.luid.high = 0;
 
-       for ( i=0; i<num_privs; i++ ) {
-               if ( !is_privilege_assigned(privilege_mask, &privs[i].privilege_mask) )
+       for ( i=0; i<ARRAY_SIZE(privs); i++ ) {
+               if ((privilege_mask & privs[i].privilege_mask) == 0)
                        continue;
 
                luid.luid.high = 0;
                luid.luid.low = privs[i].luid;
 
                if ( !privilege_set_add( set, luid ) )
-                       return False;
+                       return false;
        }
 
-       return True;
+       return true;
 }
 
 /*******************************************************************
 *******************************************************************/
 
-static bool luid_to_se_priv( struct lsa_LUID *luid, uint64_t *privilege_mask )
+bool privilege_set_to_se_priv( uint64_t *privilege_mask, struct lsa_PrivilegeSet *privset )
 {
-       int i;
-       uint32 num_privs = count_all_privileges();
+       uint32_t i;
+
+       ZERO_STRUCTP( privilege_mask );
+
+       for ( i=0; i<privset->count; i++ ) {
+               uint64_t r;
+
+               /* sanity check for invalid privilege.  we really
+                  only care about the low 32 bits */
+
+               if ( privset->set[i].luid.high != 0 )
+                       return false;
 
-       for ( i=0; i<num_privs; i++ ) {
-               if ( luid->low == privs[i].luid ) {
-                       se_priv_copy( privilege_mask, &privs[i].privilege_mask );
-                       return True;
+               r = sec_privilege_mask(privset->set[i].luid.low);
+               if (r) {
+                       *privilege_mask |= r;
                }
        }
 
-       return False;
+       return true;
 }
 
-/*******************************************************************
-*******************************************************************/
+/*
+  map a privilege id to the wire string constant
+*/
+const char *sec_privilege_name(enum sec_privilege privilege)
+{
+       int i;
+       for (i=0;i<ARRAY_SIZE(privs);i++) {
+               if (privs[i].luid == privilege) {
+                       return privs[i].name;
+               }
+       }
+       return NULL;
+}
 
-bool privilege_set_to_se_priv( uint64_t *privilege_mask, struct lsa_PrivilegeSet *privset )
+/*
+  map a privilege id to a privilege display name. Return NULL if not found
+
+  TODO: this should use language mappings
+*/
+const char *sec_privilege_display_name(enum sec_privilege privilege, uint16_t *language)
 {
        int i;
+       for (i=0;i<ARRAY_SIZE(privs);i++) {
+               if (privs[i].luid == privilege) {
+                       return privs[i].description;
+               }
+       }
+       return NULL;
+}
 
-       ZERO_STRUCTP( privilege_mask );
+/*
+  map a privilege name to a privilege id. Return SEC_PRIV_INVALID if not found
+*/
+enum sec_privilege sec_privilege_id(const char *name)
+{
+       int i;
+       for (i=0;i<ARRAY_SIZE(privs);i++) {
+               if (strcasecmp(privs[i].name, name) == 0) {
+                       return privs[i].luid;
+               }
+       }
+       return SEC_PRIV_INVALID;
+}
 
-       for ( i=0; i<privset->count; i++ ) {
-               uint64_t r;
+/*
+  map a 'right' name to it's bitmap value. Return 0 if not found
+*/
+uint32_t sec_right_bit(const char *name)
+{
+       int i;
+       for (i=0;i<ARRAY_SIZE(rights);i++) {
+               if (strcasecmp(rights[i].name, name) == 0) {
+                       return rights[i].right_mask;
+               }
+       }
+       return 0;
+}
 
-               /* sanity check for invalid privilege.  we really
-                  only care about the low 32 bits */
+/*
+  assist in walking the table of privileges - return the LUID (low 32 bits) by index
+*/
+enum sec_privilege sec_privilege_from_index(int idx)
+{
+       if (idx >= 0 && idx<ARRAY_SIZE(privs)) {
+               return privs[idx].luid;
+       }
+       return SEC_PRIV_INVALID;
+}
 
-               if ( privset->set[i].luid.high != 0 )
-                       return False;
+/*
+  assist in walking the table of privileges - return the string constant by index
+*/
+const char *sec_privilege_name_from_index(int idx)
+{
+       if (idx >= 0 && idx<ARRAY_SIZE(privs)) {
+               return privs[idx].name;
+       }
+       return NULL;
+}
+
+
+
+/*
+  return true if a security_token has a particular privilege bit set
+*/
+bool security_token_has_privilege(const struct security_token *token, enum sec_privilege privilege)
+{
+       uint64_t mask;
+
+       if (!token) {
+               return false;
+       }
+
+       mask = sec_privilege_mask(privilege);
+       if (mask == 0) {
+               return false;
+       }
+
+       if (token->privilege_mask & mask) {
+               return true;
+       }
+       return false;
+}
+
+bool security_token_system_privilege(const struct security_token *token)
+{
+       if (token == NULL) {
+               return false;
+       }
 
-               if ( luid_to_se_priv( &privset->set[i].luid, &r ) )
-                       se_priv_add( privilege_mask, &r );
+       if (token->privilege_mask == (uint64_t)~0) {
+               return true;
        }
 
-       return True;
+       return false;
+}
+
+/*
+  set a bit in the privilege mask
+*/
+void security_token_set_privilege(struct security_token *token, enum sec_privilege privilege)
+{
+       /* Relies on the fact that an invalid privilage will return 0, so won't change this */
+       token->privilege_mask |= sec_privilege_mask(privilege);
+}
+
+/*
+  set a bit in the rights mask
+*/
+void security_token_set_right_bit(struct security_token *token, uint32_t right_bit)
+{
+       token->rights_mask |= right_bit;
+}
+
+void security_token_debug_privileges(int dbg_class, int dbg_lev, const struct security_token *token)
+{
+       DEBUGADDC(dbg_class, dbg_lev, (" Privileges (0x%16llX):\n",
+                                      (unsigned long long) token->privilege_mask));
+
+       if (token->privilege_mask) {
+               int idx = 0;
+               int i = 0;
+               for (idx = 0; idx<ARRAY_SIZE(privs); idx++) {
+                       if (token->privilege_mask & privs[idx].privilege_mask) {
+                               DEBUGADDC(dbg_class, dbg_lev,
+                                         ("  Privilege[%3lu]: %s\n", (unsigned long)i++,
+                                          privs[idx].name));
+                       }
+               }
+       }
+       DEBUGADDC(dbg_class, dbg_lev, (" Rights (0x%16lX):\n",
+                                      (unsigned long) token->rights_mask));
+
+       if (token->rights_mask) {
+               int idx = 0;
+               int i = 0;
+               for (idx = 0; idx<ARRAY_SIZE(rights); idx++) {
+                       if (token->rights_mask & rights[idx].right_mask) {
+                               DEBUGADDC(dbg_class, dbg_lev,
+                                         ("  Right[%3lu]: %s\n", (unsigned long)i++,
+                                          rights[idx].name));
+                       }
+               }
+       }
 }