s3-privs Make privilege_enum_sids() take an LUID, not a bitmap
[abartlet/samba.git/.git] / source3 / lib / privileges.c
index eabb652c3eb37eacec553a6d2ccedc72f574775d..436e4569321ab2300e34151bbf0a625cf7e99226 100644 (file)
 /*
    Unix SMB/CIFS implementation.
    Privileges handling functions
-   Copyright (C) Jean François Micouleau       1998-2001
+   Copyright (C) Jean François Micouleau      1998-2001
    Copyright (C) Simo Sorce                    2002-2003
-   Copyright (C) Gerald (Jerry) Carter          2004
-   
+   Copyright (C) Gerald (Jerry) Carter          2005
+   Copyright (C) Michael Adam                  2007
+
    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
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    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., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+
 #include "includes.h"
+#include "dbwrap.h"
 
 #define PRIVPREFIX              "PRIV_"
 
-#define ALLOC_CHECK(ptr, err, label, str) do { if ((ptr) == NULL) \
-       { DEBUG(0, ("%s: out of memory!\n", str)); err = NT_STATUS_NO_MEMORY; goto label; } } while(0)
-       
-PRIVS privs[] = {
-       {SE_NETWORK_LOGON,              "SeNetworkLogonRight",                  "Access this computer from the network"},
-       {SE_INTERACTIVE_LOGON,          "SeInteractiveLogonRight",              "Log on locally"},
-       {SE_BATCH_LOGON,                "SeBatchLogonRight",                    "Log on as a batch job"},
-       {SE_SERVICE_LOGON,              "SeServiceLogonRight",                  "Log on as a service"},
-
-       {SE_MACHINE_ACCOUNT,            "SeMachineAccountPrivilege",            "Add machines to domain"},
-       {SE_PRINT_OPERATOR,             "SePrintOperatorPrivilege",             "Printer Admin"},
-       {SE_ADD_USERS,                  "SeAddUsersPrivilege",                  "Add users and groups to the domain"},
-
-       {SE_END,                        "",                                     ""}
-};
-       
-
-#if 0  /* not needed currently */
-PRIVS privs[] = {
-       {SE_ASSIGN_PRIMARY_TOKEN,       "SeAssignPrimaryTokenPrivilege",        "Assign Primary Token"},
-       {SE_CREATE_TOKEN,               "SeCreateTokenPrivilege",               "Create Token"},
-       {SE_LOCK_MEMORY,                "SeLockMemoryPrivilege",                "Lock Memory"},
-       {SE_INCREASE_QUOTA,             "SeIncreaseQuotaPrivilege",             "Increase Quota"},
-       {SE_UNSOLICITED_INPUT,          "SeUnsolicitedInputPrivilege",          "Unsolicited Input"},
-       {SE_MACHINE_ACCOUNT,            "SeMachineAccountPrivilege",            "Can add Machine Accounts to the Domain"},
-       {SE_TCB,                        "SeTcbPrivilege",                       "Act as part of the operating system"},
-       {SE_SECURITY,                   "SeSecurityPrivilege",                  "Security Privilege"},
-       {SE_TAKE_OWNERSHIP,             "SeTakeOwnershipPrivilege",             "Take Ownership Privilege"},
-       {SE_LOAD_DRIVER,                "SeLocalDriverPrivilege",               "Local Driver Privilege"},
-       {SE_SYSTEM_PROFILE,             "SeSystemProfilePrivilege",             "System Profile Privilege"},
-       {SE_SYSTEM_TIME,                "SeSystemtimePrivilege",                "System Time"},
-       {SE_PROF_SINGLE_PROCESS,        "SeProfileSingleProcessPrivilege",      "Profile Single Process Privilege"},
-       {SE_INC_BASE_PRIORITY,          "SeIncreaseBasePriorityPrivilege",      "Increase Base Priority Privilege"},
-       {SE_CREATE_PAGEFILE,            "SeCreatePagefilePrivilege",            "Create Pagefile Privilege"},
-       {SE_CREATE_PERMANENT,           "SeCreatePermanentPrivilege",           "Create Permanent"},
-       {SE_BACKUP,                     "SeBackupPrivilege",                    "Backup Privilege"},
-       {SE_RESTORE,                    "SeRestorePrivilege",                   "Restore Privilege"},
-       {SE_SHUTDOWN,                   "SeShutdownPrivilege",                  "Shutdown Privilege"},
-       {SE_DEBUG,                      "SeDebugPrivilege",                     "Debug Privilege"},
-       {SE_AUDIT,                      "SeAuditPrivilege",                     "Audit"},
-       {SE_SYSTEM_ENVIRONMENT,         "SeSystemEnvironmentPrivilege",         "System Environment Privilege"},
-       {SE_CHANGE_NOTIFY,              "SeChangeNotifyPrivilege",              "Change Notify"},
-       {SE_REMOTE_SHUTDOWN,            "SeRemoteShutdownPrivilege",            "Remote Shutdown Privilege"},
-       {SE_UNDOCK,                     "SeUndockPrivilege",                    "Undock"},
-       {SE_SYNC_AGENT,                 "SeSynchronizationAgentPrivilege",      "Synchronization Agent"},
-       {SE_ENABLE_DELEGATION,          "SeEnableDelegationPrivilege",          "Enable Delegation"},
-       {SE_PRINT_OPERATOR,             "SePrintOperatorPrivilege",             "Printer Operator"},
-       {SE_ADD_USERS,                  "SeAddUsersPrivilege",                  "Add Users"},
-       {SE_ALL_PRIVS,                  "SeAllPrivileges",                      "All Privileges"}
-       {SE_END,                        "",                                     ""}
-};
-#endif
-
-typedef struct priv_sid_list {
-       uint32 se_priv;
+typedef struct {
+       uint32_t count;
+       struct dom_sid *list;
+} SID_LIST;
+
+typedef struct {
+       TALLOC_CTX *mem_ctx;
+       uint64_t privilege;
        SID_LIST sids;
 } PRIV_SID_LIST;
 
-/***************************************************************************
- Retrieve the privilege mask (set) for a given SID
-****************************************************************************/
 
-static uint32 get_privileges( const DOM_SID *sid )
+static bool get_privileges( const struct dom_sid *sid, uint64_t *mask )
 {
-       TDB_CONTEXT *tdb = get_account_pol_tdb();
-       fstring keystr;
-       uint32 priv_mask;
-       
-       if ( !tdb )
-               return 0;
+       struct db_context *db = get_account_pol_db();
+       fstring tmp, keystr;
+       TDB_DATA data;
 
-       fstr_sprintf( keystr, "%s%s", PRIVPREFIX, sid_string_static(sid) );
+       /* Fail if the admin has not enable privileges */
 
-       if ( !tdb_fetch_uint32( tdb, keystr, &priv_mask ) ) {
-               DEBUG(3,("get_privileges: No privileges assigned to SID [%s]\n",
-                       sid_string_static(sid)));
-               return 0;
+       if ( !lp_enable_privileges() ) {
+               return False;
        }
-       
-       return priv_mask;
-}
-
-/***************************************************************************
- Store the privilege mask (set) for a given SID
-****************************************************************************/
 
-static BOOL set_privileges( const DOM_SID *sid, uint32 mask )
-{
-       TDB_CONTEXT *tdb = get_account_pol_tdb();
-       fstring keystr;
-       
-       if ( !tdb )
+       if ( db == NULL )
                return False;
 
-       fstr_sprintf( keystr, "%s%s", PRIVPREFIX, sid_string_static(sid) );
+       /* PRIV_<SID> (NULL terminated) as the key */
 
-       return tdb_store_uint32( tdb, keystr, mask );
-}
+       fstr_sprintf(keystr, "%s%s", PRIVPREFIX, sid_to_fstring(tmp, sid));
 
-/****************************************************************************
- check if the privilege is in the privilege list
-****************************************************************************/
+       data = dbwrap_fetch_bystring( db, talloc_tos(), keystr );
 
-static BOOL check_priv_in_privilege(PRIVILEGE_SET *priv_set, LUID_ATTR set)
-{
-       int i;
-
-       if ( !priv_set )
+       if ( !data.dptr ) {
+               DEBUG(3, ("get_privileges: No privileges assigned to SID "
+                         "[%s]\n", sid_string_dbg(sid)));
                return False;
+       }
 
-       for ( i = 0; i < priv_set->count; i++ ) {
-               LUID_ATTR *cur_set;
+       if (data.dsize == 4*4) {
+               DEBUG(3, ("get_privileges: Should not have obtained old-style privileges record for SID "
+                         "[%s]\n", sid_string_dbg(sid)));
+               return False;
+       }
 
-               cur_set = &priv_set->set[i];
+       if (data.dsize != sizeof( uint64_t ) ) {
+               DEBUG(3, ("get_privileges: Invalid privileges record assigned to SID "
+                         "[%s]\n", sid_string_dbg(sid)));
+               return False;
+       }
 
-               /* check only the low and high part. Checking the attr 
-                  field has no meaning */
+       *mask = BVAL(data.dptr, 0);
 
-               if ( (cur_set->luid.low == set.luid.low) 
-                       && (cur_set->luid.high == set.luid.high) ) 
-               {
-                       return True;
-               }
-       }
+       TALLOC_FREE(data.dptr);
 
-       return False;
+       return True;
 }
 
-/****************************************************************************
- add a privilege to a privilege array
- ****************************************************************************/
+/***************************************************************************
+ Store the privilege mask (set) for a given SID
+****************************************************************************/
 
-static NTSTATUS add_privilege(PRIVILEGE_SET *priv_set, LUID_ATTR set)
+static bool set_privileges( const struct dom_sid *sid, uint64_t *mask )
 {
-       NTSTATUS ret;
-       LUID_ATTR *new_set;
-
-       /* check if the privilege is not already in the list */
-
-       if ( check_priv_in_privilege(priv_set, set) )
-               return NT_STATUS_OK;
+       struct db_context *db = get_account_pol_db();
+       uint8_t privbuf[8];
+       fstring tmp, keystr;
+       TDB_DATA data;
 
-       /* we can allocate memory to add the new privilege */
-
-       new_set = TALLOC_REALLOC_ARRAY(priv_set->mem_ctx, priv_set->set, LUID_ATTR, priv_set->count + 1);
-       ALLOC_CHECK(new_set, ret, done, "add_privilege");
-
-       new_set[priv_set->count].luid.high = set.luid.high;
-       new_set[priv_set->count].luid.low = set.luid.low;
-       new_set[priv_set->count].attr = set.attr;
+       if ( !lp_enable_privileges() )
+               return False;
 
-       priv_set->count++;
-       priv_set->set = new_set;
+       if ( db == NULL )
+               return False;
 
-       ret = NT_STATUS_OK;
+       if ( !sid || (sid->num_auths == 0) ) {
+               DEBUG(0,("set_privileges: Refusing to store empty SID!\n"));
+               return False;
+       }
 
-done:
-       return ret;
-}
+       /* PRIV_<SID> (NULL terminated) as the key */
 
-/*********************************************************************
- Generate the LUID_ATTR structure based on a bitmask
-*********************************************************************/
+       fstr_sprintf(keystr, "%s%s", PRIVPREFIX, sid_to_fstring(tmp, sid));
 
-static LUID_ATTR get_privilege_luid( uint32 mask )
-{
-       LUID_ATTR priv_luid;
+       /* This writes the 64 bit bitmask out in little endian format */
+       SBVAL(privbuf,0,*mask);
 
-       priv_luid.attr = 0;
-       priv_luid.luid.high = 0;
-       priv_luid.luid.low = mask;
+       data.dptr  = (uint8 *)mask;
+       data.dsize = sizeof(uint64_t);
 
-       return priv_luid;
+       return NT_STATUS_IS_OK(dbwrap_store_bystring(db, keystr, data,
+                                                    TDB_REPLACE));
 }
 
 /*********************************************************************
- Convert a privilege mask to an LUID_ATTR[] and add the privileges to 
- the PRIVILEGE_SET
+ get a list of all privileges for all sids in the list
 *********************************************************************/
 
-static void add_privilege_set( PRIVILEGE_SET *privset, uint32 mask )
+bool get_privileges_for_sids(uint64_t *privileges, struct dom_sid *slist, int scount)
 {
-       LUID_ATTR luid;
+       uint64_t mask;
        int i;
-       
-       for (i=0; privs[i].se_priv != SE_END; i++) {
-
-               /* skip if the privilege is not part of the mask */
-
-               if ( !(mask & privs[i].se_priv) ) 
-                       continue;
-
-               /* remove the bit from the mask */
+       bool found = False;
 
-               mask &= ~privs[i].se_priv;      
-               
-               luid = get_privilege_luid( privs[i].se_priv );
-               
-               add_privilege( privset, luid );
-       }
+       *privileges = 0;
 
-       /* log an error if we have anything left at this point */
-       if ( mask )
-               DEBUG(0,("add_privilege_set: leftover bits! [0x%x]\n", mask ));
-}
-
-/*********************************************************************
- get a list of all privleges for all sids the in list
-*********************************************************************/
-
-void get_privileges_for_sids(PRIVILEGE_SET *privset, DOM_SID *slist, int scount)
-{
-       uint32 priv_mask;
-       int i;
-       
        for ( i=0; i<scount; i++ ) {
-               priv_mask = get_privileges( &slist[i] );
-
                /* don't add unless we actually have a privilege assigned */
 
-               if ( priv_mask == 0 )
+               if ( !get_privileges( &slist[i], &mask ) )
                        continue;
-               
-               DEBUG(5,("get_privileges_for_sids: sid = %s, privilege mask = 0x%x\n",
-                       sid_string_static(&slist[i]), priv_mask));
-                       
-               add_privilege_set( privset, priv_mask );
+
+               DEBUG(5,("get_privileges_for_sids: sid = %s\nPrivilege "
+                        "set: 0x%llx\n", sid_string_dbg(&slist[i]),
+                        (unsigned long long)mask));
+
+               *privileges |= mask;
+               found = True;
        }
+
+       return found;
 }
 
 
 /*********************************************************************
- travseral functions for privilege_enumerate_accounts
+ traversal functions for privilege_enumerate_accounts
 *********************************************************************/
 
-static int priv_traverse_fn(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data, void *state)
+static int priv_traverse_fn(struct db_record *rec, void *state)
 {
-       PRIV_SID_LIST *priv = state;
+       PRIV_SID_LIST *priv = (PRIV_SID_LIST *)state;
        int  prefixlen = strlen(PRIVPREFIX);
-       DOM_SID sid;
+       struct dom_sid sid;
        fstring sid_string;
 
+       /* easy check first */
+
+       if (rec->value.dsize != sizeof(uint64_t) )
+               return 0;
+
        /* check we have a PRIV_+SID entry */
 
-       if ( strncmp(key.dptr, PRIVPREFIX, prefixlen) != 0)
+       if ( strncmp((char *)rec->key.dptr, PRIVPREFIX, prefixlen) != 0)
                return 0;
-               
+
        /* check to see if we are looking for a particular privilege */
 
-       if ( priv->se_priv != SE_NONE ) {
-               uint32 mask = SVAL(data.dptr, 0);
-               
-               /* if the SID does not have the specified privilege 
+       fstrcpy( sid_string, (char *)&(rec->key.dptr[strlen(PRIVPREFIX)]) );
+
+       if (priv->privilege != 0) {
+               uint64_t mask;
+
+               if (rec->value.dsize == 4*4) {
+                       DEBUG(3, ("get_privileges: Should not have obtained old-style privileges record for SID "
+                                 "[%s]\n", sid_string));
+                       return 0;
+               }
+
+               if (rec->value.dsize != sizeof( uint64_t ) ) {
+                       DEBUG(3, ("get_privileges: Invalid privileges record assigned to SID "
+                                 "[%s]\n", sid_string));
+                       return 0;
+               }
+
+               mask = BVAL(rec->value.dptr, 0);
+
+               /* if the SID does not have the specified privilege
                   then just return */
-                  
-               if ( !(mask & priv->se_priv) )
+
+               if ((mask & priv->privilege) == 0) {
                        return 0;
+               }
        }
-               
-       fstrcpy( sid_string, &key.dptr[strlen(PRIVPREFIX)] );
+
+       /* this is a last ditch safety check to preventing returning
+          and invalid SID (i've somehow run into this on development branches) */
+
+       if ( strcmp( "S-0-0", sid_string ) == 0 )
+               return 0;
 
        if ( !string_to_sid(&sid, sid_string) ) {
                DEBUG(0,("travsersal_fn_enum__acct: Could not convert SID [%s]\n",
@@ -292,8 +212,13 @@ static int priv_traverse_fn(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data, void *s
                return 0;
        }
 
-       add_sid_to_array( &sid, &priv->sids.list, &priv->sids.count );
-       
+       if (!NT_STATUS_IS_OK(add_sid_to_array(priv->mem_ctx, &sid,
+                                             &priv->sids.list,
+                                             &priv->sids.count)))
+       {
+               return 0;
+       }
+
        return 0;
 }
 
@@ -301,41 +226,50 @@ static int priv_traverse_fn(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data, void *s
  Retreive list of privileged SIDs (for _lsa_enumerate_accounts()
 *********************************************************************/
 
-NTSTATUS privilege_enumerate_accounts(DOM_SID **sids, int *num_sids)
+NTSTATUS privilege_enumerate_accounts(struct dom_sid **sids, int *num_sids)
 {
-       TDB_CONTEXT *tdb = get_account_pol_tdb();
+       struct db_context *db = get_account_pol_db();
        PRIV_SID_LIST priv;
-       
+
+       if (db == NULL) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
        ZERO_STRUCT(priv);
-       priv.se_priv = SE_NONE;
 
-       tdb_traverse( tdb, priv_traverse_fn, &priv);
+       db->traverse_read(db, priv_traverse_fn, &priv);
 
        /* give the memory away; caller will free */
-       
+
        *sids      = priv.sids.list;
        *num_sids  = priv.sids.count;
 
        return NT_STATUS_OK;
 }
 
-/***************************************************************************
- Retrieve the SIDs assigned to a given privilege
-****************************************************************************/
+/*********************************************************************
+ Retrieve list of SIDs granted a particular privilege
+*********************************************************************/
 
-NTSTATUS priv_get_sids(const char *privname, DOM_SID **sids, int *num_sids)
+NTSTATUS privilege_enum_sids(enum sec_privilege privilege, TALLOC_CTX *mem_ctx,
+                            struct dom_sid **sids, int *num_sids)
 {
-       TDB_CONTEXT *tdb = get_account_pol_tdb();
+       struct db_context *db = get_account_pol_db();
        PRIV_SID_LIST priv;
-       
-       ZERO_STRUCT(priv);      
-       priv.se_priv = 
-       
 
-       tdb_traverse( tdb, priv_traverse_fn, &priv);
+       if (db == NULL) {
+               return NT_STATUS_ACCESS_DENIED;
+       }
+
+       ZERO_STRUCT(priv);
+
+       priv.privilege = sec_privilege_mask(privilege);
+       priv.mem_ctx = mem_ctx;
+
+       db->traverse_read(db, priv_traverse_fn, &priv);
 
        /* give the memory away; caller will free */
-       
+
        *sids      = priv.sids.list;
        *num_sids  = priv.sids.count;
 
@@ -346,75 +280,163 @@ NTSTATUS priv_get_sids(const char *privname, DOM_SID **sids, int *num_sids)
  Add privilege to sid
 ****************************************************************************/
 
-BOOL grant_privilege(const DOM_SID *sid, uint32 priv_mask)
+bool grant_privilege(const struct dom_sid *sid, const uint64_t priv_mask)
+{
+       uint64_t old_mask, new_mask;
+
+       ZERO_STRUCT( old_mask );
+       ZERO_STRUCT( new_mask );
+
+       if ( get_privileges( sid, &old_mask ) )
+               new_mask = old_mask;
+       else
+               new_mask = 0;
+
+       new_mask |= priv_mask;
+
+       DEBUG(10,("grant_privilege: %s\n", sid_string_dbg(sid)));
+
+       DEBUGADD( 10, ("original privilege mask: 0x%llx\n", (unsigned long long)new_mask));
+
+       DEBUGADD( 10, ("new privilege mask:      0x%llx\n", (unsigned long long)new_mask));
+
+       return set_privileges( sid, &new_mask );
+}
+
+/*********************************************************************
+ Add a privilege based on its name
+*********************************************************************/
+
+bool grant_privilege_by_name(struct dom_sid *sid, const char *name)
 {
-       uint32 old_mask, new_mask;
-       
-       old_mask = get_privileges( sid );
-       
-       new_mask = old_mask | priv_mask;
-
-       DEBUG(10,("grant_privilege: %s, orig priv set = 0x%x, new privilege set = 0x%x\n",
-               sid_string_static(sid), old_mask, new_mask ));
-       
-       return set_privileges( sid, new_mask );
+       uint64_t mask;
+
+       if (! se_priv_from_name(name, &mask)) {
+               DEBUG(3, ("grant_privilege_by_name: "
+                         "No Such Privilege Found (%s)\n", name));
+               return False;
+       }
+
+       return grant_privilege( sid, mask );
 }
 
 /***************************************************************************
  Remove privilege from sid
 ****************************************************************************/
 
-BOOL revoke_privilege(const DOM_SID *sid, uint32 priv_mask)
+bool revoke_privilege(const struct dom_sid *sid, const uint64_t priv_mask)
 {
-       uint32 old_mask, new_mask;
-       
-       old_mask = get_privileges( sid );
-       
-       new_mask = old_mask & ~priv_mask;
-
-        DEBUG(10,("revoke_privilege: %s, orig priv set = 0x%x, new priv set = 0x%x\n",
-                sid_string_static(sid), old_mask, new_mask ));
-       
-       return set_privileges( sid, new_mask );
+       uint64_t mask;
+
+       /* if the user has no privileges, then we can't revoke any */
+
+       if ( !get_privileges( sid, &mask ) )
+               return True;
+
+       DEBUG(10,("revoke_privilege: %s\n", sid_string_dbg(sid)));
+
+       DEBUGADD( 10, ("original privilege mask: 0x%llx\n", (unsigned long long)mask));
+
+       mask &= ~priv_mask;
+
+       DEBUGADD( 10, ("new privilege mask:      0x%llx\n", (unsigned long long)mask));
+
+       return set_privileges( sid, &mask );
+}
+
+/*********************************************************************
+ Revoke all privileges
+*********************************************************************/
+
+bool revoke_all_privileges( struct dom_sid *sid )
+{
+       return revoke_privilege( sid, SE_ALL_PRIVS);
+}
+
+/*********************************************************************
+ Add a privilege based on its name
+*********************************************************************/
+
+bool revoke_privilege_by_name(struct dom_sid *sid, const char *name)
+{
+       uint64_t mask;
+
+       if (! se_priv_from_name(name, &mask)) {
+               DEBUG(3, ("revoke_privilege_by_name: "
+                         "No Such Privilege Found (%s)\n", name));
+               return False;
+       }
+
+       return revoke_privilege(sid, mask);
+
 }
 
 /***************************************************************************
  Retrieve the SIDs assigned to a given privilege
 ****************************************************************************/
 
-NTSTATUS privilege_create_account(const DOM_SID *sid )
+NTSTATUS privilege_create_account(const struct dom_sid *sid )
 {
-       return ( grant_privilege( sid, SE_NONE ) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL);
+       return ( grant_privilege(sid, 0) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL);
+}
+
+/***************************************************************************
+ Delete a privileged account
+****************************************************************************/
+
+NTSTATUS privilege_delete_account(const struct dom_sid *sid)
+{
+       struct db_context *db = get_account_pol_db();
+       fstring tmp, keystr;
+
+       if (!lp_enable_privileges()) {
+               return NT_STATUS_OK;
+       }
+
+       if (!db) {
+               return NT_STATUS_INVALID_HANDLE;
+       }
+
+       if (!sid || (sid->num_auths == 0)) {
+               return NT_STATUS_INVALID_SID;
+       }
+
+       /* PRIV_<SID> (NULL terminated) as the key */
+
+       fstr_sprintf(keystr, "%s%s", PRIVPREFIX, sid_to_fstring(tmp, sid));
+
+       return dbwrap_delete_bystring(db, keystr);
 }
 
 /****************************************************************************
- initialise a privilege list and set the talloc context 
+ initialise a privilege list and set the talloc context
  ****************************************************************************/
+
 NTSTATUS privilege_set_init(PRIVILEGE_SET *priv_set)
 {
-       NTSTATUS ret;
-       
+       TALLOC_CTX *mem_ctx;
+
        ZERO_STRUCTP( priv_set );
 
-       TALLOC_CTX *mem_ctx = talloc_init("privilege set");
-       ALLOC_CHECK(mem_ctx, ret, done, "init_privilege");
+       mem_ctx = talloc_init("privilege set");
+       if ( !mem_ctx ) {
+               DEBUG(0,("privilege_set_init: failed to initialize talloc ctx!\n"));
+               return NT_STATUS_NO_MEMORY;
+       }
 
        priv_set->mem_ctx = mem_ctx;
 
-       ret = NT_STATUS_OK;
-
-done:
-       return ret;
+       return NT_STATUS_OK;
 }
 
 /****************************************************************************
-  initialise a privilege list and with someone else's talloc context 
+  initialise a privilege list and with someone else's talloc context
 ****************************************************************************/
 
 NTSTATUS privilege_set_init_by_ctx(TALLOC_CTX *mem_ctx, PRIVILEGE_SET *priv_set)
 {
        ZERO_STRUCTP( priv_set );
-       
+
        priv_set->mem_ctx = mem_ctx;
        priv_set->ext_ctx = True;
 
@@ -440,122 +462,52 @@ void privilege_set_free(PRIVILEGE_SET *priv_set)
  duplicate alloc luid_attr
  ****************************************************************************/
 
-NTSTATUS dup_luid_attr(TALLOC_CTX *mem_ctx, LUID_ATTR **new_la, LUID_ATTR *old_la, int count)
+NTSTATUS dup_luid_attr(TALLOC_CTX *mem_ctx, struct lsa_LUIDAttribute **new_la, struct lsa_LUIDAttribute *old_la, int count)
 {
-       NTSTATUS ret;
        int i;
 
-       /* don't crash if the source pointer is NULL (since we don't
-          do priviledges now anyways) */
-
        if ( !old_la )
                return NT_STATUS_OK;
 
-       *new_la = TALLOC_ARRAY(mem_ctx, LUID_ATTR, count);
-       ALLOC_CHECK(new_la, ret, done, "dupalloc_luid_attr");
+       if (count) {
+               *new_la = TALLOC_ARRAY(mem_ctx, struct lsa_LUIDAttribute, count);
+               if ( !*new_la ) {
+                       DEBUG(0,("dup_luid_attr: failed to alloc new struct lsa_LUIDAttribute array [%d]\n", count));
+                       return NT_STATUS_NO_MEMORY;
+               }
+       } else {
+               *new_la = NULL;
+       }
 
        for (i=0; i<count; i++) {
                (*new_la)[i].luid.high = old_la[i].luid.high;
                (*new_la)[i].luid.low = old_la[i].luid.low;
-               (*new_la)[i].attr = old_la[i].attr;
+               (*new_la)[i].attribute = old_la[i].attribute;
        }
-       
-       ret = NT_STATUS_OK;
-
-done:
-       return ret;
-}
-
-/****************************************************************************
- Performa deep copy of a PRIVILEGE_SET structure.  Assumes an initialized 
- destination structure.
-*****************************************************************************/
-
-BOOL dup_privilege_set( PRIVILEGE_SET *dest, PRIVILEGE_SET *src )
-{
-       NTSTATUS result;
-       
-       if ( !dest || !src )
-               return False;
-
-       result = dup_luid_attr( dest->mem_ctx, &dest->set, src->set, src->count );
-       if ( !NT_STATUS_IS_OK(result) ) {
-               DEBUG(0,("dup_privilege_set: Failed to dup LUID_ATTR array [%s]\n", 
-                       nt_errstr(result) ));
-               return False;
-       }
-       
-       dest->control  = src->control;
-       dest->count    = src->count;
-
-       return True;
-}
 
-/****************************************************************************
- Does the user have the specified privilege ?  We only deal with one privilege
- at a time here.
-*****************************************************************************/
-
-BOOL user_has_privilege(NT_USER_TOKEN *token, uint32 privilege)
-{
-       return check_priv_in_privilege( &token->privileges, get_privilege_luid(privilege) );
-}
-
-/****************************************************************************
- Convert a LUID to a named string
-****************************************************************************/
-
-char* luid_to_privilege_name(const LUID *set)
-{
-       static fstring name;
-       int i = 0;
-
-       if (set->high != 0)
-               return NULL;
-
-       for ( i=0; privs[i].se_priv!=SE_END; i++ ) {
-               if (set->low == privs[i].se_priv) {
-                       fstrcpy(name, privs[i].name);
-                       return name;
-               }
-       }
-
-       return NULL;
+       return NT_STATUS_OK;
 }
 
-/****************************************************************************
- Convert an LUID to a 32-bit mask
-****************************************************************************/
+/*******************************************************************
+*******************************************************************/
 
-uint32 luid_to_privilege_mask(const LUID *set)
+bool is_privileged_sid( const struct dom_sid *sid )
 {
-       int i = 0;
+       uint64_t mask;
 
-       if (set->high != 0)
-               return SE_END;
-
-       for ( i=0; privs[i].se_priv != SE_END; i++ ) {
-               if (set->low == privs[i].se_priv)
-                       return privs[i].se_priv;
-       }
-
-       return SE_END;
+       return get_privileges( sid, &mask );
 }
 
 /*******************************************************************
- return the number of elements in the privlege array
 *******************************************************************/
 
-int count_all_privileges( void )
+bool grant_all_privileges( const struct dom_sid *sid )
 {
-       static int count;
-       
-       if ( count )
-               return count;
+       uint64_t mask;
 
-       /* loop over the array and count it */  
-       for ( count=0; privs[count].se_priv != SE_END; count++ ) ;
+       if (!se_priv_put_all_privileges(&mask)) {
+               return False;
+       }
 
-       return count;
+       return grant_privilege( sid, mask );
 }
-