Globally replace 'global_sam_sid' with get_global_sam_sid(), a self
[kai/samba.git] / source3 / groupdb / mapping.c
index 435d315518ded0d174cc79b5e8122a74bb94b660..70d6317a77a70606b600d9100cadc1ac0496aa0b 100644 (file)
@@ -1,6 +1,5 @@
 /* 
- *  Unix SMB/Netbios implementation.
- *  Version 1.9.
+ *  Unix SMB/CIFS implementation.
  *  RPC Pipe client / server routines
  *  Copyright (C) Andrew Tridgell              1992-2000,
  *  Copyright (C) Jean François Micouleau      1998-2001.
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
-extern DOM_SID global_sam_sid;
-
 static TDB_CONTEXT *tdb; /* used for driver files */
 
-#define DATABASE_VERSION 1
+#define DATABASE_VERSION_V1 1 /* native byte format. */
+#define DATABASE_VERSION_V2 2 /* le format. */
+
 #define GROUP_PREFIX "UNIXGROUP/"
 
 PRIVS privs[] = {
-       {SE_PRIV_NONE, "no_privs", "No privilege"},
-       {SE_PRIV_ADD_USERS, "add_users", "add users"},
-       {SE_PRIV_ADD_MACHINES, "add_computers", ""},
-       {SE_PRIV_PRINT_OPERATOR, "print_op", ""},
-       {SE_PRIV_ALL, "all_privs", ""}
+       {SE_PRIV_NONE,           "no_privs",                  "No privilege"                    }, /* this one MUST be first */
+       {SE_PRIV_ADD_MACHINES,   "SeMachineAccountPrivilege", "Add workstations to the domain"  },
+       {SE_PRIV_SEC_PRIV,       "SeSecurityPrivilege",       "Manage the audit logs"           },
+       {SE_PRIV_TAKE_OWNER,     "SeTakeOwnershipPrivilege",  "Take ownership of file"          },
+       {SE_PRIV_ADD_USERS,      "SaAddUsers",                "Add users to the domain - Samba" },
+       {SE_PRIV_PRINT_OPERATOR, "SaPrintOp",                 "Add or remove printers - Samba"  },
+       {SE_PRIV_ALL,            "SaAllPrivs",                "all privileges"                  }
 };
 /*
 PRIVS privs[] = {
@@ -62,9 +62,28 @@ PRIVS privs[] = {
        { 22, "SeSystemEnvironmentPrivilege" },
        { 23, "SeChangeNotifyPrivilege" },
        { 24, "SeRemoteShutdownPrivilege" },
+       { 25, "SeUndockPrivilege" },
+       { 26, "SeSyncAgentPrivilege" },
+       { 27, "SeEnableDelegationPrivilege" },
 };
 */
 
+       /*
+        * Those are not really privileges like the other ones.
+        * They are handled in a special case and called
+        * system privileges.
+        *
+        * SeNetworkLogonRight
+        * SeUnsolicitedInputPrivilege
+        * SeBatchLogonRight
+        * SeServiceLogonRight
+        * SeInteractiveLogonRight
+        * SeDenyInteractiveLogonRight
+        * SeDenyNetworkLogonRight
+        * SeDenyBatchLogonRight
+        * SeDenyBatchLogonRight
+        */
+
 #if 0
 /****************************************************************************
 check if the user has the required privilege.
@@ -122,15 +141,80 @@ char *decode_sid_name_use(fstring group, enum SID_NAME_USE name_use)
 }
 
 /****************************************************************************
-open the group mapping tdb
+initialise first time the mapping list - called from init_group_mapping()
 ****************************************************************************/
-BOOL init_group_mapping(void)
+static BOOL default_group_mapping(void)
+{
+       DOM_SID sid_admins;
+       DOM_SID sid_users;
+       DOM_SID sid_guests;
+       fstring str_admins;
+       fstring str_users;
+       fstring str_guests;
+       LUID_ATTR set;
+
+       PRIVILEGE_SET privilege_none;
+       PRIVILEGE_SET privilege_all;
+       PRIVILEGE_SET privilege_print_op;
+
+       init_privilege(&privilege_none);
+       init_privilege(&privilege_all);
+       init_privilege(&privilege_print_op);
+
+       set.attr=0;
+       set.luid.high=0;
+       set.luid.low=SE_PRIV_PRINT_OPERATOR;
+       add_privilege(&privilege_print_op, set);
+
+       add_all_privilege(&privilege_all);
+
+       /* Add the Wellknown groups */
+
+       add_initial_entry(-1, "S-1-5-32-544", SID_NAME_ALIAS, "Administrators", "", privilege_all, PR_ACCESS_FROM_NETWORK|PR_LOG_ON_LOCALLY);
+       add_initial_entry(-1, "S-1-5-32-545", SID_NAME_ALIAS, "Users", "", privilege_none, PR_ACCESS_FROM_NETWORK|PR_LOG_ON_LOCALLY);
+       add_initial_entry(-1, "S-1-5-32-546", SID_NAME_ALIAS, "Guests", "", privilege_none, PR_ACCESS_FROM_NETWORK);
+       add_initial_entry(-1, "S-1-5-32-547", SID_NAME_ALIAS, "Power Users", "", privilege_none, PR_ACCESS_FROM_NETWORK|PR_LOG_ON_LOCALLY);
+
+       add_initial_entry(-1, "S-1-5-32-548", SID_NAME_ALIAS, "Account Operators", "", privilege_none, PR_ACCESS_FROM_NETWORK|PR_LOG_ON_LOCALLY);
+       add_initial_entry(-1, "S-1-5-32-549", SID_NAME_ALIAS, "System Operators", "", privilege_none, PR_ACCESS_FROM_NETWORK|PR_LOG_ON_LOCALLY);
+       add_initial_entry(-1, "S-1-5-32-550", SID_NAME_ALIAS, "Print Operators", "", privilege_print_op, PR_ACCESS_FROM_NETWORK|PR_LOG_ON_LOCALLY);
+       add_initial_entry(-1, "S-1-5-32-551", SID_NAME_ALIAS, "Backup Operators", "", privilege_none, PR_ACCESS_FROM_NETWORK|PR_LOG_ON_LOCALLY);
+
+       add_initial_entry(-1, "S-1-5-32-552", SID_NAME_ALIAS, "Replicators", "", privilege_none, PR_ACCESS_FROM_NETWORK);
+
+       /* Add the defaults domain groups */
+
+       sid_copy(&sid_admins, get_global_sam_sid());
+       sid_append_rid(&sid_admins, DOMAIN_GROUP_RID_ADMINS);
+       sid_to_string(str_admins, &sid_admins);
+       add_initial_entry(-1, str_admins, SID_NAME_DOM_GRP, "Domain Admins", "", privilege_all, PR_ACCESS_FROM_NETWORK|PR_LOG_ON_LOCALLY);
+
+       sid_copy(&sid_users,  get_global_sam_sid());
+       sid_append_rid(&sid_users,  DOMAIN_GROUP_RID_USERS);
+       sid_to_string(str_users, &sid_users);
+       add_initial_entry(-1, str_users,  SID_NAME_DOM_GRP, "Domain Users",  "", privilege_none, PR_ACCESS_FROM_NETWORK|PR_LOG_ON_LOCALLY);
+
+       sid_copy(&sid_guests, get_global_sam_sid());
+       sid_append_rid(&sid_guests, DOMAIN_GROUP_RID_GUESTS);
+       sid_to_string(str_guests, &sid_guests);
+       add_initial_entry(-1, str_guests, SID_NAME_DOM_GRP, "Domain Guests", "", privilege_none, PR_ACCESS_FROM_NETWORK);
+
+       return True;
+}
+
+/****************************************************************************
+ Open the group mapping tdb.
+****************************************************************************/
+
+static BOOL init_group_mapping(void)
 {
        static pid_t local_pid;
        char *vstring = "INFO/version";
-
-       if (tdb && local_pid == sys_getpid()) return True;
-       tdb = tdb_open(lock_path("group_mapping.tdb"), 0, 0, O_RDWR|O_CREAT, 0600);
+       int32 vers_id;
+       
+       if (tdb && local_pid == sys_getpid())
+               return True;
+       tdb = tdb_open_log(lock_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
        if (!tdb) {
                DEBUG(0,("Failed to open group mapping database\n"));
                return False;
@@ -140,12 +224,25 @@ BOOL init_group_mapping(void)
 
        /* handle a Samba upgrade */
        tdb_lock_bystring(tdb, vstring);
-       if (tdb_fetch_int(tdb, vstring) != DATABASE_VERSION) {
-               tdb_traverse(tdb, (tdb_traverse_func)tdb_delete, NULL);
-               tdb_store_int(tdb, vstring, DATABASE_VERSION);
+
+       /* Cope with byte-reversed older versions of the db. */
+       vers_id = tdb_fetch_int32(tdb, vstring);
+       if ((vers_id == DATABASE_VERSION_V1) || (IREV(vers_id) == DATABASE_VERSION_V1)) {
+               /* Written on a bigendian machine with old fetch_int code. Save as le. */
+               tdb_store_int32(tdb, vstring, DATABASE_VERSION_V2);
+               vers_id = DATABASE_VERSION_V2;
+       }
+
+       if (vers_id != DATABASE_VERSION_V2) {
+               tdb_traverse(tdb, tdb_traverse_delete_fn, NULL);
+               tdb_store_int32(tdb, vstring, DATABASE_VERSION_V2);
        }
+
        tdb_unlock_bystring(tdb, vstring);
 
+       /* write a list of default groups */
+       if(!default_group_mapping())
+               return False;
 
        return True;
 }
@@ -156,15 +253,31 @@ BOOL add_mapping_entry(GROUP_MAP *map, int flag)
 {
        TDB_DATA kbuf, dbuf;
        pstring key, buf;
-       fstring string_sid;
+       fstring string_sid="";
        int len;
+       int i;
+       PRIVILEGE_SET *set;
+
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
        
        sid_to_string(string_sid, &map->sid);
 
        len = tdb_pack(buf, sizeof(buf), "ddffd",
-                       map->gid, map->sid_name_use, map->nt_name, map->comment, map->privilege);
+                       map->gid, map->sid_name_use, map->nt_name, map->comment, map->systemaccount);
+
+       /* write the privilege list in the TDB database */
 
-       if (len > sizeof(buf)) return False;
+       set=&map->priv_set;
+       len += tdb_pack(buf+len, sizeof(buf)-len, "d", set->count);
+       for (i=0; i<set->count; i++)
+               len += tdb_pack(buf+len, sizeof(buf)-len, "ddd", 
+                               set->set[i].luid.low, set->set[i].luid.high, set->set[i].attr);
+
+       if (len > sizeof(buf))
+               return False;
 
        slprintf(key, sizeof(key), "%s%s", GROUP_PREFIX, string_sid);
 
@@ -181,16 +294,24 @@ BOOL add_mapping_entry(GROUP_MAP *map, int flag)
 initialise first time the mapping list
 ****************************************************************************/
 BOOL add_initial_entry(gid_t gid, fstring sid, enum SID_NAME_USE sid_name_use,
-                             fstring nt_name, fstring comment, uint32 privilege)
+                             fstring nt_name, fstring comment, PRIVILEGE_SET priv_set, uint32 systemaccount)
 {
        GROUP_MAP map;
 
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
+       
        map.gid=gid;
        string_to_sid(&map.sid, sid);
        map.sid_name_use=sid_name_use;
        fstrcpy(map.nt_name, nt_name);
        fstrcpy(map.comment, comment);
-       map.privilege=privilege;
+       map.systemaccount=systemaccount;
+
+       map.priv_set.count=priv_set.count;
+       map.priv_set.set=priv_set.set;
 
        add_mapping_entry(&map, TDB_INSERT);
 
@@ -198,63 +319,201 @@ BOOL add_initial_entry(gid_t gid, fstring sid, enum SID_NAME_USE sid_name_use,
 }
 
 /****************************************************************************
-initialise first time the mapping list
+initialise a privilege list
 ****************************************************************************/
-BOOL default_group_mapping(void)
+void init_privilege(PRIVILEGE_SET *priv_set)
 {
-       DOM_SID sid_admins;
-       DOM_SID sid_users;
-       DOM_SID sid_guests;
-       fstring str_admins;
-       fstring str_users;
-       fstring str_guests;
+       priv_set->count=0;
+       priv_set->control=0;
+       priv_set->set=NULL;
+}
 
+/****************************************************************************
+free a privilege list
+****************************************************************************/
+BOOL free_privilege(PRIVILEGE_SET *priv_set)
+{
+       if (priv_set->count==0) {
+               DEBUG(100,("free_privilege: count=0, nothing to clear ?\n"));
+               return False;
+       }
 
-       /* Add the Wellknown groups */
+       if (priv_set->set==NULL) {
+               DEBUG(0,("free_privilege: list ptr is NULL, very strange !\n"));
+               return False;
+       }
 
-       add_initial_entry(-1, "S-1-5-32-544", SID_NAME_WKN_GRP, "Administrators", "", SE_PRIV_ALL);
-       add_initial_entry(-1, "S-1-5-32-545", SID_NAME_WKN_GRP, "Users", "", SE_PRIV_NONE);
-       add_initial_entry(-1, "S-1-5-32-546", SID_NAME_WKN_GRP, "Guests", "", SE_PRIV_NONE);
-       add_initial_entry(-1, "S-1-5-32-547", SID_NAME_WKN_GRP, "Power Users", "", SE_PRIV_NONE);
+       safe_free(priv_set->set);
+       priv_set->count=0;
+       priv_set->control=0;
+       priv_set->set=NULL;
 
-       add_initial_entry(-1, "S-1-5-32-548", SID_NAME_WKN_GRP, "Account Operators", "", SE_PRIV_NONE);
-       add_initial_entry(-1, "S-1-5-32-549", SID_NAME_WKN_GRP, "System Operators", "", SE_PRIV_NONE);
-       add_initial_entry(-1, "S-1-5-32-550", SID_NAME_WKN_GRP, "Print Operators", "", SE_PRIV_PRINT_OPERATOR);
-       add_initial_entry(-1, "S-1-5-32-551", SID_NAME_WKN_GRP, "Backup Operators", "", SE_PRIV_NONE);
+       return True;
+}
 
-       add_initial_entry(-1, "S-1-5-32-552", SID_NAME_WKN_GRP, "Replicators", "", SE_PRIV_NONE);
+/****************************************************************************
+add a privilege to a privilege array
+****************************************************************************/
+BOOL add_privilege(PRIVILEGE_SET *priv_set, LUID_ATTR set)
+{
+       LUID_ATTR *new_set;
 
-       /* Add the defaults domain groups */
+       /* check if the privilege is not already in the list */
+       if (check_priv_in_privilege(priv_set, set))
+               return False;
 
-       sid_copy(&sid_admins, &global_sam_sid);
-       sid_append_rid(&sid_admins, DOMAIN_GROUP_RID_ADMINS);
-       sid_to_string(str_admins, &sid_admins);
-       add_initial_entry(-1, str_admins, SID_NAME_DOM_GRP, "Domain Admins", "", SE_PRIV_ALL);
+       /* we can allocate memory to add the new privilege */
 
-       sid_copy(&sid_users,  &global_sam_sid);
-       sid_append_rid(&sid_users,  DOMAIN_GROUP_RID_USERS);
-       sid_to_string(str_users, &sid_users);
-       add_initial_entry(-1, str_users,  SID_NAME_DOM_GRP, "Domain Users",  "", SE_PRIV_NONE);
+       new_set=(LUID_ATTR *)Realloc(priv_set->set, (priv_set->count+1)*(sizeof(LUID_ATTR)));
+       if (new_set==NULL) {
+               DEBUG(0,("add_privilege: could not Realloc memory to add a new privilege\n"));
+               return False;
+       }
 
-       sid_copy(&sid_guests, &global_sam_sid);
-       sid_append_rid(&sid_guests, DOMAIN_GROUP_RID_GUESTS);
-       sid_to_string(str_guests, &sid_guests);
-       add_initial_entry(-1, str_guests, SID_NAME_DOM_GRP, "Domain Guests", "", SE_PRIV_NONE);
+       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;
+       
+       priv_set->count++;
+       priv_set->set=new_set;
+       
+       return True;    
+}
+
+/****************************************************************************
+add all the privileges to a privilege array
+****************************************************************************/
+BOOL add_all_privilege(PRIVILEGE_SET *priv_set)
+{
+       LUID_ATTR set;
 
+       set.attr=0;
+       set.luid.high=0;
+       
+       set.luid.low=SE_PRIV_ADD_USERS;
+       add_privilege(priv_set, set);
+
+       set.luid.low=SE_PRIV_ADD_MACHINES;
+       add_privilege(priv_set, set);
+
+       set.luid.low=SE_PRIV_PRINT_OPERATOR;
+       add_privilege(priv_set, set);
+       
        return True;
 }
 
+/****************************************************************************
+check if the privilege list is empty
+****************************************************************************/
+BOOL check_empty_privilege(PRIVILEGE_SET *priv_set)
+{
+       return (priv_set->count == 0);
+}
+
+/****************************************************************************
+check if the privilege is in the privilege list
+****************************************************************************/
+BOOL check_priv_in_privilege(PRIVILEGE_SET *priv_set, LUID_ATTR set)
+{
+       int i;
+
+       /* if the list is empty, obviously we can't have it */
+       if (check_empty_privilege(priv_set))
+               return False;
+
+       for (i=0; i<priv_set->count; i++) {
+               LUID_ATTR *cur_set;
+
+               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 True;
+       }
+
+       return False;
+}
+
+/****************************************************************************
+remove a privilege to a privilege array
+****************************************************************************/
+BOOL remove_privilege(PRIVILEGE_SET *priv_set, LUID_ATTR set)
+{
+       LUID_ATTR *new_set;
+       LUID_ATTR *old_set;
+       int i,j;
+
+       /* check if the privilege is in the list */
+       if (!check_priv_in_privilege(priv_set, set))
+               return False;
+
+       /* special case if it's the only privilege in the list */
+       if (priv_set->count==1) {
+               free_privilege(priv_set);
+               init_privilege(priv_set);       
+       
+               return True;
+       }
+
+       /* 
+        * the privilege is there, create a new list,
+        * and copy the other privileges
+        */
+
+       old_set=priv_set->set;
+
+       new_set=(LUID_ATTR *)malloc((priv_set->count-1)*(sizeof(LUID_ATTR)));
+       if (new_set==NULL) {
+               DEBUG(0,("remove_privilege: could not malloc memory for new privilege list\n"));
+               return False;
+       }
+
+       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;
+
+               j++;
+       }
+       
+       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));
+               safe_free(new_set);
+               return False;
+       }
+               
+       /* ok everything is fine */
+       
+       priv_set->count--;
+       priv_set->set=new_set;
+       
+       safe_free(old_set);
+       
+       return True;    
+}
 
 /****************************************************************************
 return the sid and the type of the unix group
 ****************************************************************************/
-BOOL get_group_map_from_sid(DOM_SID sid, GROUP_MAP *map)
+BOOL get_group_map_from_sid(DOM_SID sid, GROUP_MAP *map, BOOL with_priv)
 {
        TDB_DATA kbuf, dbuf;
        pstring key;
        fstring string_sid;
        int ret;
+       int i;
+       PRIVILEGE_SET *set;
        
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
+
        /* the key is the SID, retrieving is direct */
 
        sid_to_string(string_sid, &sid);
@@ -267,14 +526,34 @@ BOOL get_group_map_from_sid(DOM_SID sid, GROUP_MAP *map)
        if (!dbuf.dptr) return False;
 
        ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddffd",
-                               &map->gid, &map->sid_name_use, &map->nt_name, &map->comment, &map->privilege);
+                               &map->gid, &map->sid_name_use, &map->nt_name, &map->comment, &map->systemaccount);
+
+       set=&map->priv_set;
+       init_privilege(set);
+       ret += tdb_unpack(dbuf.dptr+ret, dbuf.dsize-ret, "d", &set->count);
+
+       DEBUG(10,("get_group_map_from_sid: %d privileges\n", map->priv_set.count));
+
+       set->set = NULL;
+       if (set->count) {
+               set->set=(LUID_ATTR *)smb_xmalloc(set->count*sizeof(LUID_ATTR));
+       }
+
+       for (i=0; i<set->count; i++)
+               ret += tdb_unpack(dbuf.dptr+ret, dbuf.dsize-ret, "ddd", 
+                               &(set->set[i].luid.low), &(set->set[i].luid.high), &(set->set[i].attr));
 
-       safe_free(dbuf.dptr);
+       SAFE_FREE(dbuf.dptr);
        if (ret != dbuf.dsize) {
-               DEBUG(0,("get_group_map_from_sid: mapping TDB corrupted ?\n"));
+               DEBUG(0,("get_group_map_from_sid: group mapping TDB corrupted ?\n"));
+               free_privilege(set);
                return False;
        }
 
+       /* we don't want the privileges */
+       if (with_priv==MAPPING_WITHOUT_PRIV)
+               free_privilege(set);
+
        sid_copy(&map->sid, &sid);
        
        return True;
@@ -284,11 +563,18 @@ BOOL get_group_map_from_sid(DOM_SID sid, GROUP_MAP *map)
 /****************************************************************************
 return the sid and the type of the unix group
 ****************************************************************************/
-BOOL get_group_map_from_gid(gid_t gid, GROUP_MAP *map)
+BOOL get_group_map_from_gid(gid_t gid, GROUP_MAP *map, BOOL with_priv)
 {
        TDB_DATA kbuf, dbuf, newkey;
        fstring string_sid;
        int ret;
+       int i;
+       PRIVILEGE_SET *set;
+
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
 
        /* we need to enumerate the TDB to find the GID */
 
@@ -306,13 +592,32 @@ BOOL get_group_map_from_gid(gid_t gid, GROUP_MAP *map)
                string_to_sid(&map->sid, string_sid);
                
                ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddffd",
-                                &map->gid, &map->sid_name_use, &map->nt_name, &map->comment, &map->privilege);
+                                &map->gid, &map->sid_name_use, &map->nt_name, &map->comment, &map->systemaccount);
 
-               safe_free(dbuf.dptr);
-               if (ret != dbuf.dsize) continue;
+               set=&map->priv_set;
+               ret += tdb_unpack(dbuf.dptr+ret, dbuf.dsize-ret, "d", &set->count);
+               set->set = NULL;
+               if (set->count) {
+                       set->set=(LUID_ATTR *)smb_xmalloc(set->count*sizeof(LUID_ATTR));
+               }
+
+               for (i=0; i<set->count; i++)
+                       ret += tdb_unpack(dbuf.dptr+ret, dbuf.dsize-ret, "ddd", 
+                                       &(set->set[i].luid.low), &(set->set[i].luid.high), &(set->set[i].attr));
 
-               if (gid==map->gid)
+               SAFE_FREE(dbuf.dptr);
+               if (ret != dbuf.dsize){
+                       free_privilege(set);
+                       continue;
+               }
+
+               if (gid==map->gid) {
+                       if (!with_priv)
+                               free_privilege(&map->priv_set);
                        return True;
+               }
+               
+               free_privilege(set);
        }
 
        return False;
@@ -321,13 +626,20 @@ BOOL get_group_map_from_gid(gid_t gid, GROUP_MAP *map)
 /****************************************************************************
 return the sid and the type of the unix group
 ****************************************************************************/
-BOOL get_group_map_from_ntname(char *name, GROUP_MAP *map)
+BOOL get_group_map_from_ntname(char *name, GROUP_MAP *map, BOOL with_priv)
 {
        TDB_DATA kbuf, dbuf, newkey;
        fstring string_sid;
        int ret;
+       int i;
+       PRIVILEGE_SET *set;
 
-       /* we need to enumerate the TDB to find the GID */
+       if(!init_group_mapping()) {
+               DEBUG(0,("get_group_map_from_ntname:failed to initialize group mapping"));
+               return(False);
+       }
+
+       /* we need to enumerate the TDB to find the name */
 
        for (kbuf = tdb_firstkey(tdb); 
             kbuf.dptr; 
@@ -343,21 +655,41 @@ BOOL get_group_map_from_ntname(char *name, GROUP_MAP *map)
                string_to_sid(&map->sid, string_sid);
                
                ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddffd",
-                                &map->gid, &map->sid_name_use, &map->nt_name, &map->comment, &map->privilege);
+                                &map->gid, &map->sid_name_use, &map->nt_name, &map->comment, &map->systemaccount);
 
-               safe_free(dbuf.dptr);
-               if (ret != dbuf.dsize) continue;
+               set=&map->priv_set;
+               ret += tdb_unpack(dbuf.dptr+ret, dbuf.dsize-ret, "d", &set->count);
+       
+               set->set=(LUID_ATTR *)malloc(set->count*sizeof(LUID_ATTR));
+               if (set->set==NULL) {
+                       DEBUG(0,("get_group_map_from_ntname: could not allocate memory for privileges\n"));
+                       return False;
+               }
+
+               for (i=0; i<set->count; i++)
+                       ret += tdb_unpack(dbuf.dptr+ret, dbuf.dsize-ret, "ddd", 
+                                       &(set->set[i].luid.low), &(set->set[i].luid.high), &(set->set[i].attr));
 
-               if (StrCaseCmp(name, map->nt_name)==0)
+               SAFE_FREE(dbuf.dptr);
+               if (ret != dbuf.dsize) {
+                       free_privilege(set);
+                       continue;
+               }
+
+               if (StrCaseCmp(name, map->nt_name)==0) {
+                       if (!with_priv)
+                               free_privilege(&map->priv_set);
                        return True;
+               }
 
+               free_privilege(set);
        }
 
        return False;
 }
 
 /****************************************************************************
-enumerate the group mapping
+ remove a group mapping entry
 ****************************************************************************/
 BOOL group_map_remove(DOM_SID sid)
 {
@@ -365,6 +697,11 @@ BOOL group_map_remove(DOM_SID sid)
        pstring key;
        fstring string_sid;
        
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
+
        /* the key is the SID, retrieving is direct */
 
        sid_to_string(string_sid, &sid);
@@ -376,7 +713,7 @@ BOOL group_map_remove(DOM_SID sid)
        dbuf = tdb_fetch(tdb, kbuf);
        if (!dbuf.dptr) return False;
        
-       safe_free(dbuf.dptr);
+       SAFE_FREE(dbuf.dptr);
 
        if(tdb_delete(tdb, kbuf) != TDB_SUCCESS)
                return False;
@@ -388,15 +725,23 @@ BOOL group_map_remove(DOM_SID sid)
 /****************************************************************************
 enumerate the group mapping
 ****************************************************************************/
-BOOL enum_group_mapping(enum SID_NAME_USE sid_name_use, GROUP_MAP **rmap, int *num_entries)
+BOOL enum_group_mapping(enum SID_NAME_USE sid_name_use, GROUP_MAP **rmap,
+                       int *num_entries, BOOL unix_only, BOOL with_priv)
 {
        TDB_DATA kbuf, dbuf, newkey;
        fstring string_sid;
        fstring group_type;
        GROUP_MAP map;
-       GROUP_MAP *mapt=NULL;
+       GROUP_MAP *mapt;
        int ret;
        int entries=0;
+       int i;
+       PRIVILEGE_SET *set;
+
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
 
        *num_entries=0;
        *rmap=NULL;
@@ -405,94 +750,143 @@ BOOL enum_group_mapping(enum SID_NAME_USE sid_name_use, GROUP_MAP **rmap, int *n
             kbuf.dptr; 
             newkey = tdb_nextkey(tdb, kbuf), safe_free(kbuf.dptr), kbuf=newkey) {
 
-               if (strncmp(kbuf.dptr, GROUP_PREFIX, strlen(GROUP_PREFIX)) != 0) continue;
+               if (strncmp(kbuf.dptr, GROUP_PREFIX, strlen(GROUP_PREFIX)) != 0)
+                       continue;
                
                dbuf = tdb_fetch(tdb, kbuf);
-               if (!dbuf.dptr) continue;
+               if (!dbuf.dptr)
+                       continue;
 
                fstrcpy(string_sid, kbuf.dptr+strlen(GROUP_PREFIX));
                                
                ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddffd",
-                                &map.gid, &map.sid_name_use, &map.nt_name, &map.comment, &map.privilege);
+                                &map.gid, &map.sid_name_use, &map.nt_name, &map.comment, &map.systemaccount);
 
-               safe_free(dbuf.dptr);
-               if (ret != dbuf.dsize) continue;
+               set=&map.priv_set;
+               init_privilege(set);
+               
+               ret += tdb_unpack(dbuf.dptr+ret, dbuf.dsize-ret, "d", &set->count);
+       
+               if (set->count!=0) {
+                       set->set=(LUID_ATTR *)malloc(set->count*sizeof(LUID_ATTR));
+                       if (set->set==NULL) {
+                               DEBUG(0,("enum_group_mapping: could not allocate memory for privileges\n"));
+                               return False;
+                       }
+               }
+
+               for (i=0; i<set->count; i++)
+                       ret += tdb_unpack(dbuf.dptr+ret, dbuf.dsize-ret, "ddd", 
+                                       &(set->set[i].luid.low), &(set->set[i].luid.high), &(set->set[i].attr));
+
+               SAFE_FREE(dbuf.dptr);
+               if (ret != dbuf.dsize) {
+                       DEBUG(11,("enum_group_mapping: error in memory size\n"));
+                       free_privilege(set);
+                       continue;
+               }
 
                /* list only the type or everything if UNKNOWN */
-               if (sid_name_use!=SID_NAME_UNKNOWN  && sid_name_use!=map.sid_name_use) continue;
+               if (sid_name_use!=SID_NAME_UNKNOWN  && sid_name_use!=map.sid_name_use) {
+                       DEBUG(11,("enum_group_mapping: group %s is not of the requested type\n", map.nt_name));
+                       free_privilege(set);
+                       continue;
+               }
+               
+               if (unix_only==ENUM_ONLY_MAPPED && map.gid==-1) {
+                       DEBUG(11,("enum_group_mapping: group %s is non mapped\n", map.nt_name));
+                       free_privilege(set);
+                       continue;
+               }
 
                string_to_sid(&map.sid, string_sid);
                
                decode_sid_name_use(group_type, map.sid_name_use);
+               DEBUG(11,("enum_group_mapping: returning group %s of type %s\n", map.nt_name ,group_type));
 
-               mapt=(GROUP_MAP *)Realloc(mapt, (entries+1)*sizeof(GROUP_MAP));
+               mapt=(GROUP_MAP *)Realloc((*rmap), (entries+1)*sizeof(GROUP_MAP));
+               if (!mapt) {
+                       DEBUG(0,("enum_group_mapping: Unable to enlarge group map!\n"));
+                       SAFE_FREE(*rmap);
+                       free_privilege(set);
+                       return False;
+               }
+               else
+                       (*rmap) = mapt;
 
                mapt[entries].gid = map.gid;
                sid_copy( &mapt[entries].sid, &map.sid);
                mapt[entries].sid_name_use = map.sid_name_use;
                fstrcpy(mapt[entries].nt_name, map.nt_name);
                fstrcpy(mapt[entries].comment, map.comment);
-               mapt[entries].privilege = map.privilege;
+               mapt[entries].systemaccount=map.systemaccount;
+               mapt[entries].priv_set.count=set->count;
+               mapt[entries].priv_set.control=set->control;
+               mapt[entries].priv_set.set=set->set;
+               if (!with_priv)
+                       free_privilege(&(mapt[entries].priv_set));
 
                entries++;
        }
 
-       *rmap=mapt;
        *num_entries=entries;
        return True;
 }
 
 
 /****************************************************************************
-convert a privilege list to a privilege value
+convert a privilege string to a privilege array
 ****************************************************************************/
-void convert_priv_from_text(uint32 *se_priv, char *privilege)
+void convert_priv_from_text(PRIVILEGE_SET *se_priv, char *privilege)
 {
        pstring tok;
        char *p = privilege;
        int i;
+       LUID_ATTR set;
 
        /* By default no privilege */
-       (*se_priv)=0x0;
-
+       init_privilege(se_priv);
+       
        if (privilege==NULL)
                return;
 
        while(next_token(&p, tok, " ", sizeof(tok)) ) {
                for (i=0; i<=PRIV_ALL_INDEX; i++) {
-                       if (StrCaseCmp(privs[i].priv, tok)==0)
-                               (*se_priv)+=privs[i].se_priv;
+                       if (StrCaseCmp(privs[i].priv, tok)==0) {
+                               set.attr=0;
+                               set.luid.high=0;
+                               set.luid.low=privs[i].se_priv;
+                               add_privilege(se_priv, set);
+                       }
                }               
        }
 }
 
 /****************************************************************************
-convert a privilege value to a privilege list
+convert a privilege array to a privilege string
 ****************************************************************************/
-void convert_priv_to_text(uint32 se_priv, char *privilege)
+void convert_priv_to_text(PRIVILEGE_SET *se_priv, char *privilege)
 {
-       int i;
+       int i,j;
 
        if (privilege==NULL)
                return;
 
        ZERO_STRUCTP(privilege);
 
-       if (se_priv==SE_PRIV_NONE) {
-               fstrcat(privilege, privs[0].priv);
+       if (check_empty_privilege(se_priv)) {
+               fstrcat(privilege, "No privilege");
                return;
        }
 
-       if (se_priv==SE_PRIV_ALL) {
-               fstrcat(privilege, privs[PRIV_ALL_INDEX].priv);
-               return;
-       }
-
-       for (i=1; privs[i].se_priv!=SE_PRIV_ALL; i++) {
-               if ( (se_priv & privs[i].se_priv) == privs[i].se_priv) {
-                       fstrcat(privilege, privs[i].priv);
-                       fstrcat(privilege, " ");
+       for(i=0; i<se_priv->count; i++) {
+               j=1;
+               while (privs[j].se_priv!=se_priv->set[i].luid.low && j<=PRIV_ALL_INDEX) {
+                       j++;
                }
+
+               fstrcat(privilege, privs[j].priv);
+               fstrcat(privilege, " ");
        }
 }
 
@@ -509,23 +903,48 @@ void convert_priv_to_text(uint32 se_priv, char *privilege)
 
 /* get a domain group from it's SID */
 
-BOOL get_domain_group_from_sid(DOM_SID sid, GROUP_MAP *map)
+BOOL get_domain_group_from_sid(DOM_SID sid, GROUP_MAP *map, BOOL with_priv)
 {
        struct group *grp;
 
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
+
+       DEBUG(10, ("get_domain_group_from_sid\n"));
+
        /* if the group is NOT in the database, it CAN NOT be a domain group */
-       if(!get_group_map_from_sid(sid, map))
+       if(!get_group_map_from_sid(sid, map, with_priv))
                return False;
 
+       DEBUG(10, ("get_domain_group_from_sid: SID found in the TDB\n"));
+
        /* if it's not a domain group, continue */
-       if (map->sid_name_use!=SID_NAME_DOM_GRP)
+       if (map->sid_name_use!=SID_NAME_DOM_GRP) {
+               if (with_priv)
+                       free_privilege(&map->priv_set);
                return False;
+       }
+
+       DEBUG(10, ("get_domain_group_from_sid: SID is a domain group\n"));
        
-       if (map->gid==-1)
+       if (map->gid==-1) {
+               if (with_priv)
+                       free_privilege(&map->priv_set);
+               return False;
+       }
+
+       DEBUG(10, ("get_domain_group_from_sid: SID is mapped to gid:%d\n",map->gid));
+
+       if ( (grp=getgrgid(map->gid)) == NULL) {
+               DEBUG(10, ("get_domain_group_from_sid: gid DOESN'T exist in UNIX security\n"));
+               if (with_priv)
+                       free_privilege(&map->priv_set);
                return False;
+       }
 
-       if ( (grp=getgrgid(map->gid)) == NULL)
-               return False;   
+       DEBUG(10, ("get_domain_group_from_sid: gid exists in UNIX security\n"));
 
        return True;
 }
@@ -533,38 +952,54 @@ BOOL get_domain_group_from_sid(DOM_SID sid, GROUP_MAP *map)
 
 /* get a local (alias) group from it's SID */
 
-BOOL get_local_group_from_sid(DOM_SID sid, GROUP_MAP *map)
+BOOL get_local_group_from_sid(DOM_SID sid, GROUP_MAP *map, BOOL with_priv)
 {
        struct group *grp;
 
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
+
        /* The group is in the mapping table */
-       if(get_group_map_from_sid(sid, map)) {
-               if (map->sid_name_use!=SID_NAME_ALIAS)
+       if(get_group_map_from_sid(sid, map, with_priv)) {
+               if (map->sid_name_use!=SID_NAME_ALIAS) {
+                       if (with_priv)
+                               free_privilege(&map->priv_set);
                        return False;
-       
-               if (map->gid==-1)
+               }
+               
+               if (map->gid==-1) {
+                       if (with_priv)
+                               free_privilege(&map->priv_set);
                        return False;
+               }
 
-               if ( (grp=getgrgid(map->gid)) == NULL)
+               if ( (grp=getgrgid(map->gid)) == NULL) {
+                       if (with_priv)
+                               free_privilege(&map->priv_set);
                        return False;
+               }
        } else {
                /* the group isn't in the mapping table.
                 * make one based on the unix information */
                uint32 alias_rid;
 
-               sid_split_rid(&sid, &alias_rid);
-               map->gid=pdb_user_rid_to_gid(alias_rid);
+               sid_peek_rid(&sid, &alias_rid);
+               map->gid=pdb_group_rid_to_gid(alias_rid);
 
                if ((grp=getgrgid(map->gid)) == NULL)
                        return False;
 
                map->sid_name_use=SID_NAME_ALIAS;
+               map->systemaccount=PR_ACCESS_FROM_NETWORK;
 
                fstrcpy(map->nt_name, grp->gr_name);
                fstrcpy(map->comment, "Local Unix Group");
 
-               map->privilege=SE_PRIV_NONE;
+               init_privilege(&map->priv_set);
 
+               sid_copy(&map->sid, &sid);
        }
 
        return True;
@@ -572,21 +1007,35 @@ BOOL get_local_group_from_sid(DOM_SID sid, GROUP_MAP *map)
 
 /* get a builtin group from it's SID */
 
-BOOL get_builtin_group_from_sid(DOM_SID sid, GROUP_MAP *map)
+BOOL get_builtin_group_from_sid(DOM_SID sid, GROUP_MAP *map, BOOL with_priv)
 {
        struct group *grp;
 
-       if(!get_group_map_from_sid(sid, map))
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
+
+       if(!get_group_map_from_sid(sid, map, with_priv))
                return False;
 
-       if (map->sid_name_use!=SID_NAME_WKN_GRP)
+       if (map->sid_name_use!=SID_NAME_WKN_GRP) {
+               if (with_priv)
+                       free_privilege(&map->priv_set);
                return False;
+       }
 
-       if (map->gid==-1)
+       if (map->gid==-1) {
+               if (with_priv)
+                       free_privilege(&map->priv_set);
                return False;
+       }
 
-       if ( (grp=getgrgid(map->gid)) == NULL)
+       if ( (grp=getgrgid(map->gid)) == NULL) {
+               if (with_priv)
+                       free_privilege(&map->priv_set);
                return False;
+       }
 
        return True;
 }
@@ -596,11 +1045,14 @@ BOOL get_builtin_group_from_sid(DOM_SID sid, GROUP_MAP *map)
 /****************************************************************************
 Returns a GROUP_MAP struct based on the gid.
 ****************************************************************************/
-BOOL get_group_from_gid(gid_t gid, GROUP_MAP *map)
+BOOL get_group_from_gid(gid_t gid, GROUP_MAP *map, BOOL with_priv)
 {
        struct group *grp;
-       DOM_SID sid;
-       uint32 rid;
+
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
 
        if ( (grp=getgrgid(gid)) == NULL)
                return False;
@@ -608,14 +1060,16 @@ BOOL get_group_from_gid(gid_t gid, GROUP_MAP *map)
        /*
         * make a group map from scratch if doesn't exist.
         */
-       if (!get_group_map_from_gid(gid, map)) {
+       if (!get_group_map_from_gid(gid, map, with_priv)) {
                map->gid=gid;
                map->sid_name_use=SID_NAME_ALIAS;
-               map->privilege=SE_PRIV_NONE;
+               map->systemaccount=PR_ACCESS_FROM_NETWORK;
+               init_privilege(&map->priv_set);
+
+               /* interim solution until we have a last RID allocated */
 
-               rid=pdb_gid_to_group_rid(gid);
-               sid_copy(&sid, &global_sam_sid);
-               sid_append_rid(&sid, rid);
+               sid_copy(&map->sid, get_global_sam_sid());
+               sid_append_rid(&map->sid, pdb_gid_to_group_rid(gid));
 
                fstrcpy(map->nt_name, grp->gr_name);
                fstrcpy(map->comment, "Local Unix Group");
@@ -645,8 +1099,15 @@ BOOL get_uid_list_of_group(gid_t gid, uid_t **uid, int *num_uids)
        struct passwd *pwd;
        int i=0;
        char *gr;
+       uid_t *u;
  
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
+
        *num_uids = 0;
+       *uid=NULL;
        
        if ( (grp=getgrgid(gid)) == NULL)
                return False;
@@ -654,13 +1115,19 @@ BOOL get_uid_list_of_group(gid_t gid, uid_t **uid, int *num_uids)
        gr = grp->gr_mem[0];
        DEBUG(10, ("getting members\n"));
         
-       while (gr && (*gr != (char)NULL)) {
-               (*uid)=Realloc((*uid), sizeof(uid_t)*(*num_uids+1));
+       while (gr && (*gr != (char)'\0')) {
+               u = Realloc((*uid), sizeof(uid_t)*(*num_uids+1));
+               if (!u) {
+                       DEBUG(0,("get_uid_list_of_group: unable to enlarge uid list!\n"));
+                       return False;
+               }
+               else (*uid) = u;
 
-               if( (pwd=getpwnam(gr)) !=NULL) {
+               if( (pwd=getpwnam_alloc(gr)) !=NULL) {
                        (*uid)[*num_uids]=pwd->pw_uid;
                        (*num_uids)++;
                }
+               passwd_free(&pwd);
                gr = grp->gr_mem[++i];
        }
        DEBUG(10, ("got [%d] members\n", *num_uids));
@@ -668,7 +1135,12 @@ BOOL get_uid_list_of_group(gid_t gid, uid_t **uid, int *num_uids)
        setpwent();
        while ((pwd=getpwent()) != NULL) {
                if (pwd->pw_gid==gid) {
-                       (*uid)=Realloc((*uid), sizeof(uid_t)*(*num_uids+1));
+                       u = Realloc((*uid), sizeof(uid_t)*(*num_uids+1));
+                       if (!u) {
+                               DEBUG(0,("get_uid_list_of_group: unable to enlarge uid list!\n"));
+                               return False;
+                       }
+                       else (*uid) = u;
                        (*uid)[*num_uids]=pwd->pw_uid;
 
                        (*num_uids)++;
@@ -736,7 +1208,7 @@ int smb_add_user_group(char *unix_group, char *unix_user)
  Delete a UNIX group on demand.
 ****************************************************************************/
 
-int smb_delete_user_group(char *unix_group, char *unix_user)
+int smb_delete_user_group(const char *unix_group, const char *unix_user)
 {
        pstring del_script;
        int ret;
@@ -749,6 +1221,3 @@ int smb_delete_user_group(char *unix_group, char *unix_user)
        DEBUG(3,("smb_delete_user_group: Running the command `%s' gave %d\n",del_script,ret));
        return ret;
 }
-
-
-