Globally replace 'global_sam_sid' with get_global_sam_sid(), a self
[kai/samba.git] / source3 / groupdb / mapping.c
index 137f971228d68e336541071d35f7ea1cf6472976..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 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[] = {
@@ -142,14 +141,79 @@ 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;
+       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"));
@@ -160,10 +224,20 @@ 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 */
@@ -184,7 +258,10 @@ BOOL add_mapping_entry(GROUP_MAP *map, int flag)
        int i;
        PRIVILEGE_SET *set;
 
-       init_group_mapping();
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
        
        sid_to_string(string_sid, &map->sid);
 
@@ -221,6 +298,11 @@ BOOL add_initial_entry(gid_t gid, fstring sid, enum SID_NAME_USE sid_name_use,
 {
        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;
@@ -252,7 +334,7 @@ free a privilege list
 BOOL free_privilege(PRIVILEGE_SET *priv_set)
 {
        if (priv_set->count==0) {
-               DEBUG(10,("free_privilege: count=0, nothing to clear ?\n"));
+               DEBUG(100,("free_privilege: count=0, nothing to clear ?\n"));
                return False;
        }
 
@@ -325,11 +407,7 @@ check if the privilege list is empty
 ****************************************************************************/
 BOOL check_empty_privilege(PRIVILEGE_SET *priv_set)
 {
-
-       if (priv_set->count!=0)
-               return False;
-
-       return True;
+       return (priv_set->count == 0);
 }
 
 /****************************************************************************
@@ -419,73 +497,10 @@ BOOL remove_privilege(PRIVILEGE_SET *priv_set, LUID_ATTR set)
        return True;    
 }
 
-/****************************************************************************
-initialise first time the mapping list
-****************************************************************************/
-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, &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,  &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, &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;
-}
-
-
 /****************************************************************************
 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;
@@ -494,7 +509,10 @@ BOOL get_group_map_from_sid(DOM_SID sid, GROUP_MAP *map)
        int i;
        PRIVILEGE_SET *set;
        
-       init_group_mapping();
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
 
        /* the key is the SID, retrieving is direct */
 
@@ -515,11 +533,10 @@ BOOL get_group_map_from_sid(DOM_SID sid, GROUP_MAP *map)
        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=(LUID_ATTR *)malloc(set->count*sizeof(LUID_ATTR));
-       if (set->set==NULL) {
-               DEBUG(0,("get_group_map_from_sid: could not allocate memory for privileges\n"));
-               return False;
+
+       set->set = NULL;
+       if (set->count) {
+               set->set=(LUID_ATTR *)smb_xmalloc(set->count*sizeof(LUID_ATTR));
        }
 
        for (i=0; i<set->count; i++)
@@ -533,6 +550,10 @@ BOOL get_group_map_from_sid(DOM_SID sid, GROUP_MAP *map)
                return False;
        }
 
+       /* we don't want the privileges */
+       if (with_priv==MAPPING_WITHOUT_PRIV)
+               free_privilege(set);
+
        sid_copy(&map->sid, &sid);
        
        return True;
@@ -542,7 +563,7 @@ 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;
@@ -550,7 +571,10 @@ BOOL get_group_map_from_gid(gid_t gid, GROUP_MAP *map)
        int i;
        PRIVILEGE_SET *set;
 
-       init_group_mapping();
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
 
        /* we need to enumerate the TDB to find the GID */
 
@@ -572,11 +596,9 @@ BOOL get_group_map_from_gid(gid_t gid, GROUP_MAP *map)
 
                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_sid: could not allocate memory for privileges\n"));
-                       return False;
+               set->set = NULL;
+               if (set->count) {
+                       set->set=(LUID_ATTR *)smb_xmalloc(set->count*sizeof(LUID_ATTR));
                }
 
                for (i=0; i<set->count; i++)
@@ -589,9 +611,12 @@ BOOL get_group_map_from_gid(gid_t gid, GROUP_MAP *map)
                        continue;
                }
 
-               if (gid==map->gid)
+               if (gid==map->gid) {
+                       if (!with_priv)
+                               free_privilege(&map->priv_set);
                        return True;
-
+               }
+               
                free_privilege(set);
        }
 
@@ -601,7 +626,7 @@ 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;
@@ -609,7 +634,10 @@ BOOL get_group_map_from_ntname(char *name, GROUP_MAP *map)
        int i;
        PRIVILEGE_SET *set;
 
-       init_group_mapping();
+       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 */
 
@@ -634,7 +662,7 @@ BOOL get_group_map_from_ntname(char *name, GROUP_MAP *map)
        
                set->set=(LUID_ATTR *)malloc(set->count*sizeof(LUID_ATTR));
                if (set->set==NULL) {
-                       DEBUG(0,("get_group_map_from_sid: could not allocate memory for privileges\n"));
+                       DEBUG(0,("get_group_map_from_ntname: could not allocate memory for privileges\n"));
                        return False;
                }
 
@@ -648,8 +676,11 @@ BOOL get_group_map_from_ntname(char *name, GROUP_MAP *map)
                        continue;
                }
 
-               if (StrCaseCmp(name, map->nt_name)==0)
+               if (StrCaseCmp(name, map->nt_name)==0) {
+                       if (!with_priv)
+                               free_privilege(&map->priv_set);
                        return True;
+               }
 
                free_privilege(set);
        }
@@ -666,7 +697,10 @@ BOOL group_map_remove(DOM_SID sid)
        pstring key;
        fstring string_sid;
        
-       init_group_mapping();
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
 
        /* the key is the SID, retrieving is direct */
 
@@ -692,7 +726,7 @@ 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 unix_only)
+                       int *num_entries, BOOL unix_only, BOOL with_priv)
 {
        TDB_DATA kbuf, dbuf, newkey;
        fstring string_sid;
@@ -704,7 +738,10 @@ BOOL enum_group_mapping(enum SID_NAME_USE sid_name_use, GROUP_MAP **rmap,
        int i;
        PRIVILEGE_SET *set;
 
-       init_group_mapping();
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
 
        *num_entries=0;
        *rmap=NULL;
@@ -744,17 +781,20 @@ BOOL enum_group_mapping(enum SID_NAME_USE sid_name_use, GROUP_MAP **rmap,
 
                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) {
+                       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;
                }
@@ -762,6 +802,7 @@ BOOL enum_group_mapping(enum SID_NAME_USE sid_name_use, GROUP_MAP **rmap,
                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((*rmap), (entries+1)*sizeof(GROUP_MAP));
                if (!mapt) {
@@ -782,6 +823,8 @@ BOOL enum_group_mapping(enum SID_NAME_USE sid_name_use, GROUP_MAP **rmap,
                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++;
        }
@@ -860,31 +903,44 @@ void convert_priv_to_text(PRIVILEGE_SET *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;
        }
 
@@ -896,20 +952,34 @@ 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 */
@@ -937,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;
 }
@@ -961,17 +1045,22 @@ 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;
 
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
+
        if ( (grp=getgrgid(gid)) == NULL)
                return False;
 
        /*
         * 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->systemaccount=PR_ACCESS_FROM_NETWORK;
@@ -979,7 +1068,7 @@ BOOL get_group_from_gid(gid_t gid, GROUP_MAP *map)
 
                /* interim solution until we have a last RID allocated */
 
-               sid_copy(&map->sid, &global_sam_sid);
+               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);
@@ -1012,6 +1101,11 @@ BOOL get_uid_list_of_group(gid_t gid, uid_t **uid, int *num_uids)
        char *gr;
        uid_t *u;
  
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
+
        *num_uids = 0;
        *uid=NULL;
        
@@ -1029,10 +1123,11 @@ BOOL get_uid_list_of_group(gid_t gid, uid_t **uid, int *num_uids)
                }
                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));
@@ -1113,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;
@@ -1126,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;
 }
-
-
-