libcli/security Remove 'always true' return from se_priv_put_all_privileges
[samba.git] / libcli / security / privileges.c
index 6acf72e7a0f3aff69fed5cffdfaec986fdaf3582..938f34b858f88a4e1f3e2be1a86be112c46c0883 100644 (file)
 /* The use of strcasecmp here is safe, all the comparison strings are ASCII */
 #undef strcasecmp
 
-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 */
-
-       {0x0,                      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"},
-#endif
-       {SEC_PRIV_MACHINE_ACCOUNT, SE_MACHINE_ACCOUNT,   "SeMachineAccountPrivilege",   "Add machines to domain"},
-       {SEC_PRIV_TAKE_OWNERSHIP,  SE_TAKE_OWNERSHIP,    "SeTakeOwnershipPrivilege",    "Take ownership of files or other objects"},
-        {SEC_PRIV_BACKUP,          SE_BACKUP,            "SeBackupPrivilege",           "Back up files and directories"},
-        {SEC_PRIV_RESTORE,         SE_RESTORE,           "SeRestorePrivilege",          "Restore files and directories"},
-       {SEC_PRIV_REMOTE_SHUTDOWN, SE_REMOTE_SHUTDOWN,   "SeRemoteShutdownPrivilege",   "Force shutdown from a remote system"},
-
-       {SEC_PRIV_PRINT_OPERATOR,  SE_PRINT_OPERATOR,    "SePrintOperatorPrivilege",    "Manage printers"},
-       {SEC_PRIV_ADD_USERS,       SE_ADD_USERS,         "SeAddUsersPrivilege",         "Add users and groups to the domain"},
-       {SEC_PRIV_DISK_OPERATOR,   SE_DISK_OPERATOR,     "SeDiskOperatorPrivilege",     "Manage disk shares"},
-
-       {0x0, SE_END, "", ""}
-};
-
-/***************************************************************************
- copy an uint64_t privilege bitmap
-****************************************************************************/
+#define NUM_SHORT_LIST_PRIVS 8
+
+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"},
+
+       /* The list from here on was not displayed in the code from
+        * source3/ with the comment that usrmgr will display these
+        * next 2 twice if you include them.  The source4/ code has
+        * always included them, but they do not appear in Windows
+        * 2008 R2.
+
+          Finally, the parameter 'short_list' determines if the short
+          or full list (including many other privileges) is used */
 
-bool se_priv_copy( uint64_t *dst, const uint64_t *src )
-{
-       if ( !dst || !src )
-               return false;
-
-       memcpy( dst, src, sizeof(uint64_t) );
+       {SEC_PRIV_SECURITY,
+        SEC_PRIV_SECURITY_BIT,
+        "SeSecurityPrivilege",
+       "System security"},
 
-       return true;
-}
+       {SEC_PRIV_SYSTEMTIME,
+        SEC_PRIV_SYSTEMTIME_BIT,
+        "SeSystemtimePrivilege",
+       "Set the system clock"},
 
-/***************************************************************************
- put all valid privileges into a mask
-****************************************************************************/
+       {SEC_PRIV_SHUTDOWN,
+        SEC_PRIV_SHUTDOWN_BIT,
+        "SeShutdownPrivilege",
+       "Shutdown the system"},
 
-bool se_priv_put_all_privileges(uint64_t *privilege_mask)
-{
-       int i;
-       uint32_t num_privs = count_all_privileges();
+       {SEC_PRIV_DEBUG,
+        SEC_PRIV_DEBUG_BIT,
+        "SeDebugPrivilege",
+       "Debug processes"},
 
-       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);
-       }
-       return true;
-}
+       {SEC_PRIV_SYSTEM_ENVIRONMENT,
+        SEC_PRIV_SYSTEM_ENVIRONMENT_BIT,
+        "SeSystemEnvironmentPrivilege",
+       "Modify system environment"},
 
-/***************************************************************************
- combine 2 uint64_t privilege bitmaps and store the resulting set in new_mask
-****************************************************************************/
+       {SEC_PRIV_SYSTEM_PROFILE,
+        SEC_PRIV_SYSTEM_PROFILE_BIT,
+        "SeSystemProfilePrivilege",
+       "Profile the system"},
 
-void se_priv_add( uint64_t *privilege_mask, const uint64_t *addpriv )
-{
-       *privilege_mask |= *addpriv;
-}
+       {SEC_PRIV_PROFILE_SINGLE_PROCESS,
+        SEC_PRIV_PROFILE_SINGLE_PROCESS_BIT,
+        "SeProfileSingleProcessPrivilege",
+       "Profile one process"},
 
-/***************************************************************************
- remove one uint64_t privileges bitmap from another and store the resulting set
- in privilege_mask
-****************************************************************************/
+       {SEC_PRIV_INCREASE_BASE_PRIORITY,
+        SEC_PRIV_INCREASE_BASE_PRIORITY_BIT,
+        "SeIncreaseBasePriorityPrivilege",
+        "Increase base priority"},
 
-void se_priv_remove( uint64_t *privilege_mask, const uint64_t *removepriv )
-{
-       *privilege_mask &= ~*removepriv;
-}
+       {SEC_PRIV_LOAD_DRIVER,
+        SEC_PRIV_LOAD_DRIVER_BIT,
+        "SeLoadDriverPrivilege",
+       "Load drivers"},
 
-/***************************************************************************
- invert a given uint64_t and store the set in new_mask
-****************************************************************************/
+       {SEC_PRIV_CREATE_PAGEFILE,
+        SEC_PRIV_CREATE_PAGEFILE_BIT,
+        "SeCreatePagefilePrivilege",
+       "Create page files"},
 
-static void se_priv_invert( uint64_t *new_mask, const uint64_t *privilege_mask )
-{
-       uint64_t allprivs;
+       {SEC_PRIV_INCREASE_QUOTA,
+        SEC_PRIV_INCREASE_QUOTA_BIT,
+        "SeIncreaseQuotaPrivilege",
+       "Increase quota"},
 
-       se_priv_copy( &allprivs, &se_priv_all );
-       se_priv_remove( &allprivs, privilege_mask );
-       se_priv_copy( new_mask, &allprivs );
-}
+       {SEC_PRIV_CHANGE_NOTIFY,
+        SEC_PRIV_CHANGE_NOTIFY_BIT,
+        "SeChangeNotifyPrivilege",
+       "Register for change notify"},
 
-/***************************************************************************
- check if 2 privilege bitmaps (as uint64_t) are equal
-****************************************************************************/
+       {SEC_PRIV_UNDOCK,
+        SEC_PRIV_UNDOCK_BIT,
+        "SeUndockPrivilege",
+       "Undock devices"},
 
-bool se_priv_equal( const uint64_t *privilege_mask1, const uint64_t *privilege_mask2 )
-{
-       return *privilege_mask1 == *privilege_mask2;
-}
+       {SEC_PRIV_MANAGE_VOLUME,
+        SEC_PRIV_MANAGE_VOLUME_BIT,
+        "SeManageVolumePrivilege",
+       "Manage system volumes"},
 
-/***************************************************************************
- check if a uint64_t has any assigned privileges
-****************************************************************************/
+       {SEC_PRIV_IMPERSONATE,
+        SEC_PRIV_IMPERSONATE_BIT,
+        "SeImpersonatePrivilege",
+       "Impersonate users"},
 
-static bool se_priv_empty( const uint64_t *privilege_mask )
-{
-       uint64_t p1;
+       {SEC_PRIV_CREATE_GLOBAL,
+        SEC_PRIV_CREATE_GLOBAL_BIT,
+        "SeCreateGlobalPrivilege",
+       "Create global"},
 
-       se_priv_copy( &p1, privilege_mask );
+       {SEC_PRIV_ENABLE_DELEGATION,
+        SEC_PRIV_ENABLE_DELEGATION_BIT,
+        "SeEnableDelegationPrivilege",
+       "Enable Delegation"},
 
-       p1 &= se_priv_all;
+       {SEC_PRIV_INTERACTIVE_LOGON,
+        SEC_PRIV_INTERACTIVE_LOGON_BIT,
+        "SeInteractiveLogonRight",
+       "Interactive logon"},
 
-       return se_priv_equal( &p1, &se_priv_none );
-}
+       {SEC_PRIV_NETWORK_LOGON,
+        SEC_PRIV_NETWORK_LOGON_BIT,
+        "SeNetworkLogonRight",
+       "Network logon"},
 
-/*********************************************************************
- Lookup the uint64_t bitmask value for a privilege name
-*********************************************************************/
+       {SEC_PRIV_REMOTE_INTERACTIVE_LOGON,
+        SEC_PRIV_REMOTE_INTERACTIVE_LOGON_BIT,
+        "SeRemoteInteractiveLogonRight",
+       "Remote Interactive logon"}
+};
 
-bool se_priv_from_name( const char *name, uint64_t *privilege_mask )
+/*
+  return a privilege mask given a privilege id
+*/
+uint64_t sec_privilege_mask(enum sec_privilege privilege)
 {
        int i;
-
-       for ( i=0; !se_priv_equal(&privs[i].privilege_mask, &se_priv_end); i++ ) {
-               if ( strequal( privs[i].name, name ) ) {
-                       se_priv_copy( privilege_mask, &privs[i].privilege_mask );
-                       return true;
+       for (i=0;i<ARRAY_SIZE(privs);i++) {
+               if (privs[i].luid == privilege) {
+                       return privs[i].privilege_mask;
                }
        }
 
-       return false;
+       return 0;
 }
 
-/****************************************************************************
- check if the privilege (by bitmask) is in the privilege list
+/***************************************************************************
+ put all valid privileges into a mask
 ****************************************************************************/
 
-bool is_privilege_assigned(const uint64_t *privileges,
-                          const uint64_t *check)
+void se_priv_put_all_privileges(uint64_t *privilege_mask)
 {
-       uint64_t p1, p2;
-
-       if ( !privileges || !check )
-               return false;
-
-       /* everyone has privileges if you aren't checking for any */
+       int i;
+       uint32_t num_privs = ARRAY_SIZE(privs);
 
-       if ( se_priv_empty( check ) ) {
-               DEBUG(1,("is_privilege_assigned: no privileges in check_mask!\n"));
-               return true;
+       *privilege_mask = 0;
+       for ( i=0; i<num_privs; i++ ) {
+               *privilege_mask |= privs[i].privilege_mask;
        }
-
-       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 any of the privileges (by bitmask) is in the privilege list
-****************************************************************************/
+/*********************************************************************
+ Lookup the uint64_t bitmask value for a privilege name
+*********************************************************************/
 
-static bool is_any_privilege_assigned( uint64_t *privileges, const uint64_t *check )
+bool se_priv_from_name( const char *name, uint64_t *privilege_mask )
 {
-       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;
+       int i;
+       uint32_t num_privs = ARRAY_SIZE(privs);
+       for ( i=0; i<num_privs; i++ ) {
+               if ( strequal( privs[i].name, name ) ) {
+                       *privilege_mask = privs[i].privilege_mask;
+                       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 );
+       return false;
 }
 
-/*********************************************************************
- Generate the struct lsa_LUIDAttribute structure based on a bitmask
-*********************************************************************/
-
 const char* get_privilege_dispname( const char *name )
 {
        int i;
 
+       uint32_t num_privs = ARRAY_SIZE(privs);
+
        if (!name) {
                return NULL;
        }
 
-       for ( i=0; !se_priv_equal(&privs[i].privilege_mask, &se_priv_end); i++ ) {
-
+       for ( i=0; i<num_privs; i++ ) {
                if ( strequal( privs[i].name, name ) ) {
                        return privs[i].description;
                }
@@ -269,95 +235,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
  ****************************************************************************/
@@ -387,17 +273,17 @@ static bool privilege_set_add(PRIVILEGE_SET *priv_set, struct lsa_LUIDAttribute
 /*******************************************************************
 *******************************************************************/
 
-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_t num_privs = count_all_privileges();
+       uint32_t num_privs = ARRAY_SIZE(privs);
        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) )
+               if ((privilege_mask & privs[i].privilege_mask) == 0)
                        continue;
 
                luid.luid.high = 0;
@@ -413,24 +299,6 @@ bool se_priv_to_privilege_set( PRIVILEGE_SET *set, uint64_t *privilege_mask )
 /*******************************************************************
 *******************************************************************/
 
-static bool luid_to_se_priv( struct lsa_LUID *luid, uint64_t *privilege_mask )
-{
-       int i;
-       uint32_t num_privs = count_all_privileges();
-
-       for ( i=0; i<num_privs; i++ ) {
-               if ( luid->low == privs[i].luid ) {
-                       se_priv_copy( privilege_mask, &privs[i].privilege_mask );
-                       return true;
-               }
-       }
-
-       return false;
-}
-
-/*******************************************************************
-*******************************************************************/
-
 bool privilege_set_to_se_priv( uint64_t *privilege_mask, struct lsa_PrivilegeSet *privset )
 {
        int i;
@@ -446,166 +314,24 @@ bool privilege_set_to_se_priv( uint64_t *privilege_mask, struct lsa_PrivilegeSet
                if ( privset->set[i].luid.high != 0 )
                        return false;
 
-               if ( luid_to_se_priv( &privset->set[i].luid, &r ) )
-                       se_priv_add( privilege_mask, &r );
+               r = sec_privilege_mask(privset->set[i].luid.low);
+               if (r) {
+                       *privilege_mask |= r;
+               }
        }
 
        return true;
 }
 
-static const PRIVS privilege_names[] = {
-       {SEC_PRIV_SECURITY,
-        SE_SECURITY,
-        "SeSecurityPrivilege",
-       "System security"},
-
-       {SEC_PRIV_BACKUP,
-        SE_BACKUP,
-        "SeBackupPrivilege",
-        "Backup files and directories"},
-
-       {SEC_PRIV_RESTORE,
-        SE_RESTORE,
-        "SeRestorePrivilege",
-       "Restore files and directories"},
-
-       {SEC_PRIV_SYSTEMTIME,
-        SE_SYSTEMTIME,
-        "SeSystemtimePrivilege",
-       "Set the system clock"},
-
-       {SEC_PRIV_SHUTDOWN,
-        SE_SHUTDOWN,
-        "SeShutdownPrivilege",
-       "Shutdown the system"},
-
-       {SEC_PRIV_REMOTE_SHUTDOWN,
-        SE_REMOTE_SHUTDOWN,
-        "SeRemoteShutdownPrivilege",
-       "Shutdown the system remotely"},
-
-       {SEC_PRIV_TAKE_OWNERSHIP,
-        SE_TAKE_OWNERSHIP,
-        "SeTakeOwnershipPrivilege",
-       "Take ownership of files and directories"},
-
-       {SEC_PRIV_DEBUG,
-        SE_DEBUG,
-        "SeDebugPrivilege",
-       "Debug processes"},
-
-       {SEC_PRIV_SYSTEM_ENVIRONMENT,
-        SE_SYSTEM_ENVIRONMENT,
-        "SeSystemEnvironmentPrivilege",
-       "Modify system environment"},
-
-       {SEC_PRIV_SYSTEM_PROFILE,
-        SE_SYSTEM_PROFILE,
-        "SeSystemProfilePrivilege",
-       "Profile the system"},
-
-       {SEC_PRIV_PROFILE_SINGLE_PROCESS,
-        SE_PROFILE_SINGLE_PROCESS,
-        "SeProfileSingleProcessPrivilege",
-       "Profile one process"},
-
-       {SEC_PRIV_INCREASE_BASE_PRIORITY,
-        SE_INCREASE_BASE_PRIORITY,
-        "SeIncreaseBasePriorityPrivilege",
-        "Increase base priority"},
-
-       {SEC_PRIV_LOAD_DRIVER,
-        SE_LOAD_DRIVER,
-        "SeLoadDriverPrivilege",
-       "Load drivers"},
-
-       {SEC_PRIV_CREATE_PAGEFILE,
-        SE_CREATE_PAGEFILE,
-        "SeCreatePagefilePrivilege",
-       "Create page files"},
-
-       {SEC_PRIV_INCREASE_QUOTA,
-        SE_INCREASE_QUOTA,
-        "SeIncreaseQuotaPrivilege",
-       "Increase quota"},
-
-       {SEC_PRIV_CHANGE_NOTIFY,
-        SE_CHANGE_NOTIFY,
-        "SeChangeNotifyPrivilege",
-       "Register for change notify"},
-
-       {SEC_PRIV_UNDOCK,
-        SE_UNDOCK,
-        "SeUndockPrivilege",
-       "Undock devices"},
-
-       {SEC_PRIV_MANAGE_VOLUME,
-        SE_MANAGE_VOLUME,
-        "SeManageVolumePrivilege",
-       "Manage system volumes"},
-
-       {SEC_PRIV_IMPERSONATE,
-        SE_IMPERSONATE,
-        "SeImpersonatePrivilege",
-       "Impersonate users"},
-
-       {SEC_PRIV_CREATE_GLOBAL,
-        SE_CREATE_GLOBAL,
-        "SeCreateGlobalPrivilege",
-       "Create global"},
-
-       {SEC_PRIV_ENABLE_DELEGATION,
-        SE_ENABLE_DELEGATION,
-        "SeEnableDelegationPrivilege",
-       "Enable Delegation"},
-
-       {SEC_PRIV_INTERACTIVE_LOGON,
-        SE_INTERACTIVE_LOGON,
-        "SeInteractiveLogonRight",
-       "Interactive logon"},
-
-       {SEC_PRIV_NETWORK_LOGON,
-        SE_NETWORK_LOGON,
-        "SeNetworkLogonRight",
-       "Network logon"},
-
-       {SEC_PRIV_REMOTE_INTERACTIVE_LOGON,
-        SE_REMOTE_INTERACTIVE_LOGON,
-        "SeRemoteInteractiveLogonRight",
-       "Remote Interactive logon"},
-
-       {SEC_PRIV_MACHINE_ACCOUNT,
-        SE_MACHINE_ACCOUNT,
-        "SeMachineAccountPrivilege",
-        "Add workstations to domain"},
-
-       /* These last 3 are Samba only */
-       {SEC_PRIV_PRINT_OPERATOR,
-        SE_PRINT_OPERATOR,
-        "SePrintOperatorPrivilege",
-        "Manage printers"},
-
-       {SEC_PRIV_ADD_USERS,
-        SE_ADD_USERS,
-        "SeAddUsersPrivilege",
-        "Add users and groups to the domain"},
-
-       {SEC_PRIV_DISK_OPERATOR,
-        SE_DISK_OPERATOR,
-        "SeDiskOperatorPrivilege",
-        "Manage disk shares"},
-};
-
-
 /*
   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(privilege_names);i++) {
-               if (privilege_names[i].luid == privilege) {
-                       return privilege_names[i].name;
+       for (i=0;i<ARRAY_SIZE(privs);i++) {
+               if (privs[i].luid == privilege) {
+                       return privs[i].name;
                }
        }
        return NULL;
@@ -619,12 +345,9 @@ const char *sec_privilege_name(enum sec_privilege privilege)
 const char *sec_privilege_display_name(enum sec_privilege privilege, uint16_t *language)
 {
        int i;
-       if (privilege < 1 || privilege > 64) {
-               return NULL;
-       }
-       for (i=0;i<ARRAY_SIZE(privilege_names);i++) {
-               if (privilege_names[i].luid == privilege) {
-                       return privilege_names[i].description;
+       for (i=0;i<ARRAY_SIZE(privs);i++) {
+               if (privs[i].luid == privilege) {
+                       return privs[i].description;
                }
        }
        return NULL;
@@ -636,56 +359,38 @@ const char *sec_privilege_display_name(enum sec_privilege privilege, uint16_t *l
 enum sec_privilege sec_privilege_id(const char *name)
 {
        int i;
-       for (i=0;i<ARRAY_SIZE(privilege_names);i++) {
-               if (strcasecmp(privilege_names[i].name, name) == 0) {
-                       return privilege_names[i].luid;
-               }
-       }
-       return -1;
-}
-
-/*
-  map a privilege name to a privilege id. Return -1 if not found
-*/
-enum sec_privilege sec_privilege_from_mask(uint64_t mask)
-{
-       int i;
-       for (i=0;i<ARRAY_SIZE(privilege_names);i++) {
-               if (privilege_names[i].privilege_mask == mask) {
-                       return privilege_names[i].luid;
+       for (i=0;i<ARRAY_SIZE(privs);i++) {
+               if (strcasecmp(privs[i].name, name) == 0) {
+                       return privs[i].luid;
                }
        }
-       return -1;
+       return SEC_PRIV_INVALID;
 }
 
 /*
-  map a privilege name to a privilege id. Return -1 if not found
+  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(privilege_names)) {
-               return privilege_names[idx].luid;
+       if (idx >= 0 && idx<ARRAY_SIZE(privs)) {
+               return privs[idx].luid;
        }
-       return -1;
+       return SEC_PRIV_INVALID;
 }
 
-
 /*
-  return a privilege mask given a privilege id
+  assist in walking the table of privileges - return the string constant by index
 */
-static uint64_t sec_privilege_mask(enum sec_privilege privilege)
+const char *sec_privilege_name_from_index(int idx)
 {
-       int i;
-       for (i=0;i<ARRAY_SIZE(privilege_names);i++) {
-               if (privilege_names[i].luid == privilege) {
-                       return privilege_names[i].privilege_mask;
-               }
+       if (idx >= 0 && idx<ARRAY_SIZE(privs)) {
+               return privs[idx].name;
        }
-
-       return 0;
+       return NULL;
 }
 
 
+
 /*
   return true if a security_token has a particular privilege bit set
 */
@@ -719,13 +424,12 @@ void security_token_debug_privileges(int dbg_lev, const struct security_token *t
                            (unsigned long long) token->privilege_mask));
 
        if (token->privilege_mask) {
+               int idx = 0;
                int i = 0;
-               uint64_t mask;
-               for (mask = 1; mask != 0; mask = mask << 1) {
-                       if (token->privilege_mask & mask) {
-                               enum sec_privilege privilege = sec_privilege_from_mask(mask);
+               for (idx = 0; idx<ARRAY_SIZE(privs); idx++) {
+                       if (token->privilege_mask & privs[idx].privilege_mask) {
                                DEBUGADD(dbg_lev, ("  Privilege[%3lu]: %s\n", (unsigned long)i++,
-                                       sec_privilege_name(privilege)));
+                                                  privs[idx].name));
                        }
                }
        }