r4805: Last planned change to the privileges infrastructure:
[samba.git] / source3 / lib / privileges.c
index b9d4df301d95e24b12df8378af21a3aad4b8d1b9..973e9acc65f7a6c965d998d035cfe342ebb517ec 100644 (file)
@@ -3,6 +3,7 @@
    Privileges handling functions
    Copyright (C) Jean François Micouleau       1998-2001
    Copyright (C) Simo Sorce                    2002-2003
+   Copyright (C) Gerald (Jerry) Carter          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
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
 #include "includes.h"
 
-/* defines */
+#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)
-#define NTSTATUS_CHECK(err, label, str1, str2) do { if (!NT_STATUS_IS_OK(err)) { DEBUG(0, ("%s: %s failed!\n", str1, str2)); } } while(0)
+#define GENERATE_LUID_LOW(x)   (x)+1;
 
-/****************************************************************************
- Check if a user is a mapped group.
-
-   This function will check if the group SID is mapped onto a
-   system managed gid or onto a winbind manged sid.
-   In the first case it will be threated like a mapped group
-   and the backend should take the member list with a getgrgid
-   and ignore any user that have been possibly set into the group
-   object.
-
-   In the second case, the group is a fully SAM managed group
-   served back to the system through winbind. In this case the
-   members of a Local group are "unrolled" to cope with the fact
-   that unix cannot contain groups inside groups.
-   The backend MUST never call any getgr* / getpw* function or
-   loops with winbind may happen. 
- ****************************************************************************/
+static SE_PRIV se_priv_all  = SE_ALL_PRIVS;
+static SE_PRIV se_priv_end  = SE_END;
+static SE_PRIV se_priv_none = SE_NONE;
 
-#if 0
-NTSTATUS is_mapped_group(BOOL *mapped, const DOM_SID *sid)
-{
-       NTSTATUS result;
-       gid_t id;
-
-       /* look if mapping exist, do not make idmap alloc an uid if SID is not found */
-       result = idmap_get_gid_from_sid(&id, sid, False);
-       if (NT_STATUS_IS_OK(result)) {
-               *mapped = gid_is_in_winbind_range(id);
-       } else {
-               *mapped = False;
-       }
 
-       return result;
-}
-#endif
+#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,                        "",                                     ""}
+};
+       
 
-/****************************************************************************
- duplicate alloc luid_attr
- ****************************************************************************/
-NTSTATUS dupalloc_luid_attr(TALLOC_CTX *mem_ctx, LUID_ATTR **new_la, LUID_ATTR *old_la)
-{
-       NTSTATUS ret;
+#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
 
-       /* don't crash if the source pointer is NULL (since we don't
-          do priviledges now anyways) */
+typedef struct priv_sid_list {
+       SE_PRIV privilege;
+       SID_LIST sids;
+} PRIV_SID_LIST;
 
-       if ( !old_la )
-               return NT_STATUS_OK;
 
-       *new_la = (LUID_ATTR *)talloc(mem_ctx, sizeof(LUID_ATTR));
-       ALLOC_CHECK(new_la, ret, done, "dupalloc_luid_attr");
+/***************************************************************************
+ copy an SE_PRIV structure
+****************************************************************************/
 
-       (*new_la)->luid.high = old_la->luid.high;
-       (*new_la)->luid.low = old_la->luid.low;
-       (*new_la)->attr = old_la->attr;
+BOOL se_priv_copy( SE_PRIV *dst, SE_PRIV *src )
+{
+       if ( !dst || !src )
+               return False;
+               
+       memcpy( dst, src, sizeof(SE_PRIV) );
        
-       ret = NT_STATUS_OK;
-
-done:
-       return ret;
+       return True;
 }
 
-/****************************************************************************
- initialise a privilege list
- ****************************************************************************/
-NTSTATUS init_privilege(PRIVILEGE_SET **priv_set)
+/***************************************************************************
+ combine 2 SE_PRIV structures and store the resulting set in mew_mask
+****************************************************************************/
+
+static void se_priv_add( SE_PRIV *mask, SE_PRIV *addpriv )
 {
-       NTSTATUS ret;
-       TALLOC_CTX *mem_ctx = talloc_init("privilege set");
-       ALLOC_CHECK(mem_ctx, ret, done, "init_privilege");
+       int i;
 
-       *priv_set = talloc_zero(mem_ctx, sizeof(PRIVILEGE_SET));
-       ALLOC_CHECK(*priv_set, ret, done, "init_privilege");
+       for ( i=0; i<SE_PRIV_MASKSIZE; i++ ) {
+               mask->mask[i] |= addpriv->mask[i];
+       }
+}
 
-       (*priv_set)->mem_ctx = mem_ctx;
+/***************************************************************************
+ remove one SE_PRIV sytucture from another and store the resulting set 
+ in mew_mask
+****************************************************************************/
 
-       ret = NT_STATUS_OK;
+static void se_priv_remove( SE_PRIV *mask, SE_PRIV *removepriv )
+{      
+       int i;
 
-done:
-       return ret;
+       for ( i=0; i<SE_PRIV_MASKSIZE; i++ ) {
+               mask->mask[i] &= ~removepriv->mask[i];
+       }
+}
+
+/***************************************************************************
+ invert a given SE_PRIV and store the set in new_mask
+****************************************************************************/
+
+static void se_priv_invert( SE_PRIV *new_mask, SE_PRIV *mask )
+{      
+       SE_PRIV allprivs;
+       
+       se_priv_copy( &allprivs, &se_priv_all );
+       se_priv_remove( &allprivs, mask );
+       se_priv_copy( new_mask, &allprivs );
 }
 
-NTSTATUS init_priv_with_ctx(TALLOC_CTX *mem_ctx, PRIVILEGE_SET **priv_set)
+/***************************************************************************
+ check if 2 SE_PRIV structure are equal
+****************************************************************************/
+
+static BOOL se_priv_equal( SE_PRIV *mask1, SE_PRIV *mask2 )
+{      
+       return ( memcmp(mask1, mask2, sizeof(SE_PRIV)) == 0 );
+}
+
+
+/***************************************************************************
+ dump an SE_PRIV structure to the log files
+****************************************************************************/
+
+void dump_se_priv( int dbg_cl, int dbg_lvl, SE_PRIV *mask )
 {
-       NTSTATUS ret;
+       int i;
+       
+       DEBUGADDC( dbg_cl, dbg_lvl,("SE_PRIV "));
+       
+       for ( i=0; i<SE_PRIV_MASKSIZE; i++ ) {
+               DEBUGADDC( dbg_cl, dbg_lvl,(" 0x%x", mask->mask[i] ));
+       }
+               
+       DEBUGADDC( dbg_cl, dbg_lvl, ("\n"));
+}
 
-       *priv_set = talloc_zero(mem_ctx, sizeof(PRIVILEGE_SET));
-       ALLOC_CHECK(*priv_set, ret, done, "init_privilege");
+/***************************************************************************
+ Retrieve the privilege mask (set) for a given SID
+****************************************************************************/
 
-       (*priv_set)->mem_ctx = mem_ctx;
-       (*priv_set)->ext_ctx = True;
+static BOOL get_privileges( const DOM_SID *sid, SE_PRIV *mask )
+{
+       TDB_CONTEXT *tdb = get_account_pol_tdb();
+       fstring keystr;
+       TDB_DATA key, data;
+       
+       if ( !tdb )
+               return False;
 
-       ret = NT_STATUS_OK;
+       /* PRIV_<SID> (NULL terminated) as the key */
+       
+       fstr_sprintf( keystr, "%s%s", PRIVPREFIX, sid_string_static(sid) );
+       key.dptr = keystr;
+       key.dsize = strlen(keystr) + 1;
 
-done:
-       return ret;
+       data = tdb_fetch( tdb, key );
+       
+       if ( !data.dptr ) {
+               DEBUG(3,("get_privileges: No privileges assigned to SID [%s]\n",
+                       sid_string_static(sid)));
+               return False;
+       }
+       
+       SMB_ASSERT( data.dsize == sizeof( SE_PRIV ) );
+       
+       se_priv_copy( mask, (SE_PRIV*)data.dptr );
+       
+       return True;
 }
 
-void reset_privilege(PRIVILEGE_SET *priv_set)
+/***************************************************************************
+ Store the privilege mask (set) for a given SID
+****************************************************************************/
+
+static BOOL set_privileges( const DOM_SID *sid, SE_PRIV *mask )
 {
-       priv_set->count = 0;
-       priv_set->control = 0;
-       priv_set->set = NULL;
+       TDB_CONTEXT *tdb = get_account_pol_tdb();
+       fstring keystr;
+       TDB_DATA key, data;
+       
+       if ( !tdb )
+               return False;
+
+       /* PRIV_<SID> (NULL terminated) as the key */
+       
+       fstr_sprintf( keystr, "%s%s", PRIVPREFIX, sid_string_static(sid) );
+       key.dptr = keystr;
+       key.dsize = strlen(keystr) + 1;
+       
+       /* no packing.  static size structure, just write it out */
+       
+       data.dptr  = (char*)mask;
+       data.dsize = sizeof(SE_PRIV);
+
+       return ( tdb_store(tdb, key, data, TDB_REPLACE) != -1 );
 }
 
-void destroy_privilege(PRIVILEGE_SET **priv_set)
+/****************************************************************************
+ check if the privilege is in the privilege list
+****************************************************************************/
+
+static BOOL is_privilege_assigned( SE_PRIV *privileges, SE_PRIV *check )
 {
-       reset_privilege(*priv_set);
-       if (!((*priv_set)->ext_ctx))
-               /* mem_ctx is local, destroy it */
-               talloc_destroy((*priv_set)->mem_ctx);
-       *priv_set = NULL;
+       SE_PRIV p1, p2;
+
+       if ( !privileges || !check )
+               return False;
+       
+       se_priv_copy( &p1, check );
+       
+       /* invert the SE_PRIV we want to check for and remove that from the 
+          original set.  If we are left with the SE_PRIV 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 );
 }
 
 /****************************************************************************
  add a privilege to a privilege array
  ****************************************************************************/
-NTSTATUS add_privilege(PRIVILEGE_SET *priv_set, LUID_ATTR set)
+
+static BOOL privilege_set_add(PRIVILEGE_SET *priv_set, LUID_ATTR set)
 {
-       NTSTATUS ret;
        LUID_ATTR *new_set;
 
-       /* check if the privilege is not already in the list */
-       if (NT_STATUS_IS_OK(check_priv_in_privilege(priv_set, set)))
-               return NT_STATUS_UNSUCCESSFUL;
-
        /* we can allocate memory to add the new privilege */
 
-       new_set = (LUID_ATTR *)talloc_realloc(priv_set->mem_ctx, priv_set->set, (priv_set->count + 1) * (sizeof(LUID_ATTR)));
-       ALLOC_CHECK(new_set, ret, done, "add_privilege");
+       new_set = TALLOC_REALLOC_ARRAY(priv_set->mem_ctx, priv_set->set, LUID_ATTR, priv_set->count + 1);
+       if ( !new_set ) {
+               DEBUG(0,("privilege_set_add: failed to allocate memory!\n"));
+               return False;
+       }       
 
        new_set[priv_set->count].luid.high = set.luid.high;
        new_set[priv_set->count].luid.low = set.luid.low;
@@ -164,138 +280,299 @@ NTSTATUS add_privilege(PRIVILEGE_SET *priv_set, LUID_ATTR set)
        priv_set->count++;
        priv_set->set = new_set;
 
-       ret = NT_STATUS_OK;
-
-done:
-       return ret;
+       return True;
 }
 
-/****************************************************************************
- add all the privileges to a privilege array
- ****************************************************************************/
-NTSTATUS add_all_privilege(PRIVILEGE_SET *priv_set)
+/*********************************************************************
+ Generate the LUID_ATTR structure based on a bitmask
+*********************************************************************/
+
+LUID_ATTR get_privilege_luid( SE_PRIV *mask )
 {
-       NTSTATUS result = NT_STATUS_OK;
-       LUID_ATTR set;
+       LUID_ATTR priv_luid;
+       int i;
 
-       set.attr = 0;
-       set.luid.high = 0;
+       priv_luid.attr = 0;
+       priv_luid.luid.high = 0;
+       
+       for ( i=0; !se_priv_equal(&privs[i].se_priv, &se_priv_end); i++ ) {
+       
+               /* just use the index+1 (so its non-zero) into the 
+                  array as the lower portion of the LUID */
+       
+               if ( se_priv_equal( &privs[i].se_priv, mask ) ) {
+                       priv_luid.luid.low = GENERATE_LUID_LOW(i);
+               }
+       }
 
-       /* TODO: set a proper list of privileges */
-       set.luid.low = SE_PRIV_ADD_USERS;
-       result = add_privilege(priv_set, set);
-       NTSTATUS_CHECK(result, done, "add_all_privilege", "add_privilege");
+       return priv_luid;
+}
 
-       set.luid.low = SE_PRIV_ADD_MACHINES;
-       result = add_privilege(priv_set, set);
-       NTSTATUS_CHECK(result, done, "add_all_privilege", "add_privilege");
+/*********************************************************************
+ Generate the LUID_ATTR structure based on a bitmask
+*********************************************************************/
 
-       set.luid.low = SE_PRIV_PRINT_OPERATOR;
-       result = add_privilege(priv_set, set);
-       NTSTATUS_CHECK(result, done, "add_all_privilege", "add_privilege");
+const char* get_privilege_dispname( const char *name )
+{
+       int i;
+
+       for ( i=0; !se_priv_equal(&privs[i].se_priv, &se_priv_end); i++ ) {
+       
+               if ( strequal( privs[i].name, name ) ) {
+                       return privs[i].description;
+               }
+       }
 
-       return result;
+       return NULL;
 }
 
-/****************************************************************************
- check if the privilege list is empty
- ****************************************************************************/
-NTSTATUS check_empty_privilege(PRIVILEGE_SET *priv_set)
+/*********************************************************************
+ get a list of all privleges for all sids the in list
+*********************************************************************/
+
+BOOL get_privileges_for_sids(SE_PRIV *privileges, DOM_SID *slist, int scount)
 {
-       if (!priv_set)
-               return NT_STATUS_INVALID_PARAMETER;
+       SE_PRIV mask;
+       int i;
+       BOOL found = False;
 
-       if (priv_set->count == 0)
-               return NT_STATUS_OK;
+       se_priv_copy( privileges, &se_priv_none );
+       
+       for ( i=0; i<scount; i++ ) {
+               /* don't add unless we actually have a privilege assigned */
+
+               if ( !get_privileges( &slist[i], &mask ) )
+                       continue;
+
+               DEBUG(5,("get_privileges_for_sids: sid = %s\nPrivilege set:\n", 
+                       sid_string_static(&slist[i])));
+               dump_se_priv( DBGC_ALL, 5, &mask );
+                       
+               se_priv_add( privileges, &mask );
+               found = True;
+       }
 
-       return NT_STATUS_UNSUCCESSFUL;
+       return found;
 }
 
-/****************************************************************************
- check if the privilege is in the privilege list
- ****************************************************************************/
-NTSTATUS check_priv_in_privilege(PRIVILEGE_SET *priv_set, LUID_ATTR set)
+
+/*********************************************************************
+ travseral functions for privilege_enumerate_accounts
+*********************************************************************/
+
+static int priv_traverse_fn(TDB_CONTEXT *t, TDB_DATA key, TDB_DATA data, void *state)
 {
-       int i;
+       PRIV_SID_LIST *priv = state;
+       int  prefixlen = strlen(PRIVPREFIX);
+       DOM_SID sid;
+       fstring sid_string;
+       
+       /* easy check first */
+       
+       if ( data.dsize != sizeof(SE_PRIV) )
+               return 0;
 
-       if (!priv_set)
-               return NT_STATUS_INVALID_PARAMETER;
+       /* check we have a PRIV_+SID entry */
 
-       /* if the list is empty, obviously we can't have it */
-       if (NT_STATUS_IS_OK(check_empty_privilege(priv_set)))
-               return NT_STATUS_UNSUCCESSFUL;
+       if ( strncmp(key.dptr, PRIVPREFIX, prefixlen) != 0)
+               return 0;
+               
+       /* check to see if we are looking for a particular privilege */
 
-       for (i = 0; i < priv_set->count; i++) {
-               LUID_ATTR *cur_set;
+       if ( !se_priv_equal(&priv->privilege, &se_priv_none) ) {
+               SE_PRIV mask;
+               
+               se_priv_copy( &mask, (SE_PRIV*)data.dptr );
+               
+               /* if the SID does not have the specified privilege 
+                  then just return */
+                  
+               if ( !is_privilege_assigned( &mask, &priv->privilege) )
+                       return 0;
+       }
+               
+       fstrcpy( sid_string, &key.dptr[strlen(PRIVPREFIX)] );
 
-               cur_set = &priv_set->set[i];
-               /* check only the low and high part. Checking the attr field has no meaning */
-               if (    (cur_set->luid.low == set.luid.low) &&
-                       (cur_set->luid.high == set.luid.high)   ) {
-                       return NT_STATUS_OK;
-               }
+       if ( !string_to_sid(&sid, sid_string) ) {
+               DEBUG(0,("travsersal_fn_enum__acct: Could not convert SID [%s]\n",
+                       sid_string));
+               return 0;
        }
 
-       return NT_STATUS_UNSUCCESSFUL;
+       add_sid_to_array( &sid, &priv->sids.list, &priv->sids.count );
+       
+       return 0;
 }
 
-/****************************************************************************
- remove a privilege from a privilege array
- ****************************************************************************/
-NTSTATUS remove_privilege(PRIVILEGE_SET *priv_set, LUID_ATTR set)
+/*********************************************************************
+ Retreive list of privileged SIDs (for _lsa_enumerate_accounts()
+*********************************************************************/
+
+NTSTATUS privilege_enumerate_accounts(DOM_SID **sids, int *num_sids)
 {
-       NTSTATUS ret;
-       LUID_ATTR *new_set;
-       LUID_ATTR *old_set;
-       int i,j;
+       TDB_CONTEXT *tdb = get_account_pol_tdb();
+       PRIV_SID_LIST priv;
+       
+       ZERO_STRUCT(priv);
 
-       if (!priv_set)
-               return NT_STATUS_INVALID_PARAMETER;
+       se_priv_copy( &priv.privilege, &se_priv_none );
 
-       /* check if the privilege is in the list */
-       if (!NT_STATUS_IS_OK(check_priv_in_privilege(priv_set, set)))
-               return NT_STATUS_UNSUCCESSFUL;
+       tdb_traverse( tdb, priv_traverse_fn, &priv);
 
-       /* special case if it's the only privilege in the list */
-       if (priv_set->count == 1) {
-               reset_privilege(priv_set);      
-               return NT_STATUS_OK;
-       }
+       /* give the memory away; caller will free */
+       
+       *sids      = priv.sids.list;
+       *num_sids  = priv.sids.count;
 
-       /* 
-        * the privilege is there, create a new list,
-        * and copy the other privileges
-        */
+       return NT_STATUS_OK;
+}
 
-       old_set = priv_set->set;
+#if 0  /* JERRY - not used */
+/***************************************************************************
+ Retrieve the SIDs assigned to a given privilege
+****************************************************************************/
 
-       new_set = (LUID_ATTR *)talloc(priv_set->mem_ctx, (priv_set->count - 1) * (sizeof(LUID_ATTR)));
-       ALLOC_CHECK(new_set, ret, done, "remove_privilege");
+ NTSTATUS priv_get_sids(const char *privname, DOM_SID **sids, int *num_sids)
+{
+       TDB_CONTEXT *tdb = get_account_pol_tdb();
+       PRIV_SID_LIST priv;
+       
+       ZERO_STRUCT(priv);      
 
-       for (i=0, j=0; i < priv_set->count; i++) {
-               if (    (old_set[i].luid.low == set.luid.low) && 
-                       (old_set[i].luid.high == set.luid.high) ) {
-                       continue;
-               }
-               
-               new_set[j].luid.low = old_set[i].luid.low;
-               new_set[j].luid.high = old_set[i].luid.high;
-               new_set[j].attr = old_set[i].attr;
+       tdb_traverse( tdb, priv_traverse_fn, &priv);
 
-               j++;
-       }
+       /* give the memory away; caller will free */
        
-       if (j != priv_set->count - 1) {
-               DEBUG(0,("remove_privilege: mismatch ! difference is not -1\n"));
-               DEBUGADD(0,("old count:%d, new count:%d\n", priv_set->count, j));
-               return NT_STATUS_INTERNAL_ERROR;
-       }
-               
-       /* ok everything is fine */
+       *sids      = priv.sids.list;
+       *num_sids  = priv.sids.count;
+
+       return NT_STATUS_OK;
+}
+#endif
+
+/***************************************************************************
+ Add privilege to sid
+****************************************************************************/
+
+BOOL grant_privilege(const DOM_SID *sid, SE_PRIV *priv_mask)
+{
+       SE_PRIV old_mask, new_mask;
        
-       priv_set->count--;
-       priv_set->set = new_set;
+       if ( get_privileges( sid, &old_mask ) )
+               se_priv_copy( &new_mask, &old_mask );
+       else
+               se_priv_copy( &new_mask, &se_priv_none );
+
+       se_priv_add( &new_mask, priv_mask );
+
+       DEBUG(10,("grant_privilege: %s\n", sid_string_static(sid)));
+       
+       DEBUGADD( 10, ("original privilege mask:\n"));
+       dump_se_priv( DBGC_ALL, 10, &old_mask );
+       
+       DEBUGADD( 10, ("new privilege mask:\n"));
+       dump_se_priv( DBGC_ALL, 10, &new_mask );
+       
+       return set_privileges( sid, &new_mask );
+}
+
+/*********************************************************************
+ Add a privilege based on its name
+*********************************************************************/
+
+BOOL grant_privilege_by_name(DOM_SID *sid, const char *name)
+{
+       int i;
+
+       for ( i=0; !se_priv_equal(&privs[i].se_priv, &se_priv_end); i++ ) {
+               if ( strequal(privs[i].name, name) ) {
+                       return grant_privilege( sid, &privs[i].se_priv );
+                }
+        }
+
+        DEBUG(3, ("grant_privilege_by_name: No Such Privilege Found (%s)\n", name));
+
+        return False;
+}
+
+/***************************************************************************
+ Remove privilege from sid
+****************************************************************************/
+
+BOOL revoke_privilege(const DOM_SID *sid, SE_PRIV *priv_mask)
+{
+       SE_PRIV 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_static(sid)));
+       
+       DEBUGADD( 10, ("original privilege mask:\n"));
+       dump_se_priv( DBGC_ALL, 10, &mask );
+
+       se_priv_remove( &mask, priv_mask );
+       
+       DEBUGADD( 10, ("new privilege mask:\n"));
+       dump_se_priv( DBGC_ALL, 10, &mask );
        
+       return set_privileges( sid, &mask );
+}
+
+/*********************************************************************
+ Revoke all privileges
+*********************************************************************/
+
+BOOL revoke_all_privileges( DOM_SID *sid )
+{
+       return revoke_privilege( sid, &se_priv_all );
+}
+
+/*********************************************************************
+ Add a privilege based on its name
+*********************************************************************/
+
+BOOL revoke_privilege_by_name(DOM_SID *sid, const char *name)
+{
+       int i;
+
+       for ( i=0; !se_priv_equal(&privs[i].se_priv, &se_priv_end); i++ ) {
+               if ( strequal(privs[i].name, name) ) {
+                       return revoke_privilege( sid, &privs[i].se_priv );
+                }
+        }
+
+        DEBUG(3, ("revoke_privilege_by_name: No Such Privilege Found (%s)\n", name));
+
+        return False;
+}
+
+/***************************************************************************
+ Retrieve the SIDs assigned to a given privilege
+****************************************************************************/
+
+NTSTATUS privilege_create_account(const DOM_SID *sid )
+{
+       return ( grant_privilege(sid, &se_priv_none) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL);
+}
+
+/****************************************************************************
+ 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 );
+
+       mem_ctx = talloc_init("privilege set");
+       ALLOC_CHECK(mem_ctx, ret, done, "init_privilege");
+
+       priv_set->mem_ctx = mem_ctx;
+
        ret = NT_STATUS_OK;
 
 done:
@@ -303,48 +580,225 @@ done:
 }
 
 /****************************************************************************
- duplicates a privilege array
- the new privilege set must be passed inited
- (use init_privilege or init_priv_with_ctx)
+  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;
+
+       return NT_STATUS_OK;
+}
+
+/****************************************************************************
+ Free all memory used by a PRIVILEGE_SET
+****************************************************************************/
+
+void privilege_set_free(PRIVILEGE_SET *priv_set)
+{
+       if ( !priv_set )
+               return;
+
+       if ( !( priv_set->ext_ctx ) )
+               talloc_destroy( priv_set->mem_ctx );
+
+       ZERO_STRUCTP( priv_set );
+}
+
+/****************************************************************************
+ duplicate alloc luid_attr
  ****************************************************************************/
-NTSTATUS dup_priv_set(PRIVILEGE_SET *new_priv_set, PRIVILEGE_SET *priv_set)
+
+NTSTATUS dup_luid_attr(TALLOC_CTX *mem_ctx, LUID_ATTR **new_la, LUID_ATTR *old_la, int count)
 {
        NTSTATUS ret;
-       LUID_ATTR *new_set;
-       LUID_ATTR *old_set;
        int i;
 
-       if (!new_priv_set || !priv_set)
-               return NT_STATUS_INVALID_PARAMETER;
+       /* don't crash if the source pointer is NULL (since we don't
+          do priviledges now anyways) */
 
-       /* special case if there are no privileges in the list */
-       if (priv_set->count == 0) {
+       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");
+
+       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;
        }
+       
+       ret = NT_STATUS_OK;
+
+done:
+       return ret;
+}
+
+#if 0 /* not used */
+/****************************************************************************
+ 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;
+}
+#endif
+
+/****************************************************************************
+ Does the user have the specified privilege ?  We only deal with one privilege
+ at a time here.
+*****************************************************************************/
+
+BOOL user_has_privileges(NT_USER_TOKEN *token, SE_PRIV *privilege)
+{
+       return is_privilege_assigned( &token->privileges, privilege );
+}
+
+/****************************************************************************
+ Convert a LUID to a named string
+****************************************************************************/
+
+char* luid_to_privilege_name(const LUID *set)
+{
+       static fstring name;
+       int max = count_all_privileges();
+
+       if (set->high != 0)
+               return NULL;
+
+       if ( set->low > max )
+               return NULL;
+
+       fstrcpy( name, privs[set->low - 1].name );
+       
+       return name;
+}
+
+/****************************************************************************
+ Convert an LUID to a 32-bit mask
+****************************************************************************/
+
+SE_PRIV* luid_to_privilege_mask(const LUID *set)
+{
+       static SE_PRIV mask;
+       int max = count_all_privileges();
+       
+       if (set->high != 0)
+               return NULL;
 
-       /* 
-        * create a new list,
-        * and copy the other privileges
-        */
+       if ( set->low > max )
+               return NULL;
 
-       old_set = priv_set->set;
+       se_priv_copy( &mask, &privs[set->low - 1].se_priv );
 
-       new_set = (LUID_ATTR *)talloc(new_priv_set->mem_ctx, (priv_set->count - 1) * (sizeof(LUID_ATTR)));
-       ALLOC_CHECK(new_set, ret, done, "dup_priv_set");
+       return &mask;
+}
+
+/*******************************************************************
+ return the number of elements in the privlege array
+*******************************************************************/
+
+int count_all_privileges( void )
+{
+       static int count;
+       
+       if ( count )
+               return count;
 
-       for (i=0; i < priv_set->count; i++) {
+       /* loop over the array and count it */  
+       for ( count=0; !se_priv_equal(&privs[count].se_priv, &se_priv_end); count++ ) ;
+
+       return count;
+}
+
+#if 0  /* not used */
+/*******************************************************************
+ return True is the SID has an entry in the account_pol.tdb
+*******************************************************************/
+
+ BOOL is_privileged_sid( DOM_SID *sid ) 
+{
+       SE_PRIV mask;
+
+       /* check if the lookup succeeds */
+
+       return get_privileges( sid, &mask );
+}
+#endif
+
+/*******************************************************************
+*******************************************************************/
+
+BOOL se_priv_to_privilege_set( PRIVILEGE_SET *set, SE_PRIV *mask )
+{
+       int i;
+       uint32 num_privs = count_all_privileges();
+       LUID_ATTR luid;
+       
+       luid.attr = 0;
+       luid.luid.high = 0;
+       
+       for ( i=0; i<num_privs; i++ ) {
+               if ( !is_privilege_assigned(mask, &privs[i].se_priv) )
+                       continue;
+               
+               luid.luid.low = GENERATE_LUID_LOW(i);
                
-               new_set[i].luid.low = old_set[i].luid.low;
-               new_set[i].luid.high = old_set[i].luid.high;
-               new_set[i].attr = old_set[i].attr;
+               if ( !privilege_set_add( set, luid ) )
+                       return False;
        }
-                       
-       new_priv_set->count = priv_set->count;
-       new_priv_set->control = priv_set->control;
-       new_priv_set->set = new_set;
+
+       return True;
+}
+
+/*******************************************************************
+*******************************************************************/
+
+BOOL privilege_set_to_se_priv( SE_PRIV *mask, PRIVILEGE_SET *privset )
+{
+       int i;
+       uint32 num_privs = count_all_privileges();
        
-       ret = NT_STATUS_OK;
+       ZERO_STRUCTP( mask );
+       
+       for ( i=0; i<privset->count; i++ ) {
+               SE_PRIV r;
+       
+               /* sanity check for invalid privilege.  we really
+                  only care about the low 32 bits */
+                  
+               if ( privset->set[i].luid.high != 0 )
+                       return False;
+               
+               /* make sure :LUID.low is in range */   
+               if ( privset->set[i].luid.low == 0 || privset->set[i].luid.low > num_privs )
+                       return False;
+               
+               r = privs[privset->set[i].luid.low - 1].se_priv;
+               se_priv_add( mask, &r );
+       }
 
-done:
-       return ret;
+       return True;
 }
+