janitor duty (merges from 3.0) and cleanup compiler warning on SuSE 9 in the end...
[gd/samba/.git] / source3 / groupdb / mapping.c
index 32a5286408a3f2c32fd19f8edb3e2847bc55e4e1..048a6c5db053ff5fbcd393ff6d375eff1066d33e 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[] = {
@@ -38,69 +37,7 @@ PRIVS privs[] = {
        {SE_PRIV_PRINT_OPERATOR, "SaPrintOp",                 "Add or remove printers - Samba"  },
        {SE_PRIV_ALL,            "SaAllPrivs",                "all privileges"                  }
 };
-/*
-PRIVS privs[] = {
-       {  2, "SeCreateTokenPrivilege" },
-       {  3, "SeAssignPrimaryTokenPrivilege" },
-       {  4, "SeLockMemoryPrivilege" },
-       {  5, "SeIncreaseQuotaPrivilege" },
-       {  6, "SeMachineAccountPrivilege" },
-       {  7, "SeTcbPrivilege" },
-       {  8, "SeSecurityPrivilege" },
-       {  9, "SeTakeOwnershipPrivilege" },
-       { 10, "SeLoadDriverPrivilege" },
-       { 11, "SeSystemProfilePrivilege" },
-       { 12, "SeSystemtimePrivilege" },
-       { 13, "SeProfileSingleProcessPrivilege" },
-       { 14, "SeIncreaseBasePriorityPrivilege" },
-       { 15, "SeCreatePagefilePrivilege" },
-       { 16, "SeCreatePermanentPrivilege" },
-       { 17, "SeBackupPrivilege" },
-       { 18, "SeRestorePrivilege" },
-       { 19, "SeShutdownPrivilege" },
-       { 20, "SeDebugPrivilege" },
-       { 21, "SeAuditPrivilege" },
-       { 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.
-****************************************************************************/
-static BOOL se_priv_access_check(NT_USER_TOKEN *token, uint32 privilege)
-{
-       /* no token, no privilege */
-       if (token==NULL)
-               return False;
-       
-       if ((token->privilege & privilege)==privilege)
-               return True;
-       
-       return False;
-}
-#endif
 
 /****************************************************************************
 dump the mapping group mapping to a text file
@@ -142,14 +79,61 @@ 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)
 {
-       static pid_t local_pid;
-       char *vstring = "INFO/version";
+       DOM_SID sid_admins;
+       DOM_SID sid_users;
+       DOM_SID sid_guests;
+       fstring str_admins;
+       fstring str_users;
+       fstring str_guests;
+
+       /* Add the Wellknown groups */
 
-       if (tdb && local_pid == sys_getpid()) return True;
+       add_initial_entry(-1, "S-1-5-32-544", SID_NAME_WKN_GRP, "Administrators", "");
+       add_initial_entry(-1, "S-1-5-32-545", SID_NAME_WKN_GRP, "Users", "");
+       add_initial_entry(-1, "S-1-5-32-546", SID_NAME_WKN_GRP, "Guests", "");
+       add_initial_entry(-1, "S-1-5-32-547", SID_NAME_WKN_GRP, "Power Users", "");
+       add_initial_entry(-1, "S-1-5-32-548", SID_NAME_WKN_GRP, "Account Operators", "");
+       add_initial_entry(-1, "S-1-5-32-549", SID_NAME_WKN_GRP, "System Operators", "");
+       add_initial_entry(-1, "S-1-5-32-550", SID_NAME_WKN_GRP, "Print Operators", "");
+       add_initial_entry(-1, "S-1-5-32-551", SID_NAME_WKN_GRP, "Backup Operators", "");
+       add_initial_entry(-1, "S-1-5-32-552", SID_NAME_WKN_GRP, "Replicators", "");
+
+       /* 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", "");
+
+       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",  "");
+
+       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", "");
+
+       return True;
+}
+
+/****************************************************************************
+ Open the group mapping tdb.
+****************************************************************************/
+
+static BOOL init_group_mapping(void)
+{
+       static pid_t local_pid;
+       const char *vstring = "INFO/version";
+       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"));
@@ -159,40 +143,48 @@ BOOL init_group_mapping(void)
        local_pid = sys_getpid();
 
        /* 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);
+       tdb_lock_bystring(tdb, vstring, 0);
+
+       /* 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;
 }
 
 /****************************************************************************
 ****************************************************************************/
-BOOL add_mapping_entry(GROUP_MAP *map, int flag)
+static BOOL add_mapping_entry(GROUP_MAP *map, int flag)
 {
        TDB_DATA kbuf, dbuf;
        pstring key, buf;
        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->systemaccount);
-
-       /* write the privilege list in the TDB database */
-
-       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);
+       len = tdb_pack(buf, sizeof(buf), "ddff",
+                       map->gid, map->sid_name_use, map->nt_name, map->comment);
 
        if (len > sizeof(buf))
                return False;
@@ -211,284 +203,44 @@ 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, PRIVILEGE_SET priv_set, uint32 systemaccount)
+BOOL add_initial_entry(gid_t gid, const char *sid, enum SID_NAME_USE sid_name_use, const char *nt_name, const char *comment)
 {
        GROUP_MAP map;
 
-       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.systemaccount=systemaccount;
-
-       map.priv_set.count=priv_set.count;
-       map.priv_set.set=priv_set.set;
-
-       add_mapping_entry(&map, TDB_INSERT);
-
-       return True;
-}
-
-/****************************************************************************
-initialise a privilege list
-****************************************************************************/
-void init_privilege(PRIVILEGE_SET *priv_set)
-{
-       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(10,("free_privilege: count=0, nothing to clear ?\n"));
-               return False;
-       }
-
-       if (priv_set->set==NULL) {
-               DEBUG(0,("free_privilege: list ptr is NULL, very strange !\n"));
-               return False;
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
        }
-
-       safe_free(priv_set->set);
-       priv_set->count=0;
-       priv_set->control=0;
-       priv_set->set=NULL;
-
-       return True;
-}
-
-/****************************************************************************
-add a privilege to a privilege array
-****************************************************************************/
-BOOL add_privilege(PRIVILEGE_SET *priv_set, LUID_ATTR set)
-{
-       LUID_ATTR *new_set;
-
-       /* check if the privilege is not already in the list */
-       if (check_priv_in_privilege(priv_set, set))
-               return False;
-
-       /* we can allocate memory to add the new privilege */
-
-       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;
-       }
-
-       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)
-{
-
-       if (priv_set->count!=0)
-               return False;
-
-       return True;
-}
-
-/****************************************************************************
-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))
+       map.gid=gid;
+       if (!string_to_sid(&map.sid, sid)) {
+               DEBUG(0, ("string_to_sid failed: %s", sid));
                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;
+       map.sid_name_use=sid_name_use;
+       fstrcpy(map.nt_name, nt_name);
+       fstrcpy(map.comment, comment);
 
-               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 pdb_add_group_mapping_entry(&map);
 }
 
 /****************************************************************************
-initialise first time the mapping list
+ Return the sid and the type of the unix group.
 ****************************************************************************/
-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)
+static BOOL get_group_map_from_sid(DOM_SID sid, GROUP_MAP *map)
 {
        TDB_DATA kbuf, dbuf;
        pstring key;
        fstring string_sid;
-       int ret;
-       int i;
-       PRIVILEGE_SET *set;
+       int ret = 0;
        
+       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);
@@ -498,31 +250,16 @@ BOOL get_group_map_from_sid(DOM_SID sid, GROUP_MAP *map)
        kbuf.dsize = strlen(key)+1;
                
        dbuf = tdb_fetch(tdb, kbuf);
-       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->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=(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"));
+       if (!dbuf.dptr)
                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));
+       ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
+                               &map->gid, &map->sid_name_use, &map->nt_name, &map->comment);
 
        SAFE_FREE(dbuf.dptr);
-       if (ret != dbuf.dsize) {
-               DEBUG(0,("get_group_map_from_sid: group mapping TDB corrupted ?\n"));
-               free_privilege(set);
+       
+       if ( ret == -1 ) {
+               DEBUG(3,("get_group_map_from_sid: tdb_unpack failure\n"));
                return False;
        }
 
@@ -531,17 +268,20 @@ BOOL get_group_map_from_sid(DOM_SID sid, GROUP_MAP *map)
        return True;
 }
 
-
 /****************************************************************************
-return the sid and the type of the unix group
+ Return the sid and the type of the unix group.
 ****************************************************************************/
-BOOL get_group_map_from_gid(gid_t gid, GROUP_MAP *map)
+
+static BOOL get_group_map_from_gid(gid_t gid, GROUP_MAP *map)
 {
        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 */
 
@@ -552,53 +292,46 @@ BOOL get_group_map_from_gid(gid_t gid, GROUP_MAP *map)
                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));
 
                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->systemaccount);
-
-               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;
-               }
-
-               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));
+               ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
+                                &map->gid, &map->sid_name_use, &map->nt_name, &map->comment);
 
                SAFE_FREE(dbuf.dptr);
-               if (ret != dbuf.dsize){
-                       free_privilege(set);
-                       continue;
-               }
 
-               if (gid==map->gid)
+               if ( ret == -1 ) {
+                       DEBUG(3,("get_group_map_from_gid: tdb_unpack failure\n"));
+                       return False;
+               }
+       
+               if (gid==map->gid) {
+                       SAFE_FREE(kbuf.dptr);
                        return True;
-
-               free_privilege(set);
+               }
        }
 
        return False;
 }
 
 /****************************************************************************
-return the sid and the type of the unix group
+ Return the sid and the type of the unix group.
 ****************************************************************************/
-BOOL get_group_map_from_ntname(char *name, GROUP_MAP *map)
+
+static BOOL get_group_map_from_ntname(const char *name, GROUP_MAP *map)
 {
        TDB_DATA kbuf, dbuf, newkey;
        fstring string_sid;
        int ret;
-       int i;
-       PRIVILEGE_SET *set;
+
+       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 */
 
@@ -609,52 +342,47 @@ BOOL get_group_map_from_ntname(char *name, GROUP_MAP *map)
                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));
 
                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->systemaccount);
-
-               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;
-               }
-
-               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));
+               ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
+                                &map->gid, &map->sid_name_use, &map->nt_name, &map->comment);
 
                SAFE_FREE(dbuf.dptr);
-               if (ret != dbuf.dsize) {
-                       free_privilege(set);
-                       continue;
+               
+               if ( ret == -1 ) {
+                       DEBUG(3,("get_group_map_from_ntname: tdb_unpack failure\n"));
+                       return False;
                }
 
-               if (StrCaseCmp(name, map->nt_name)==0)
+               if (StrCaseCmp(name, map->nt_name)==0) {
+                       SAFE_FREE(kbuf.dptr);
                        return True;
-
-               free_privilege(set);
+               }
        }
 
        return False;
 }
 
 /****************************************************************************
- remove a group mapping entry
+ Remove a group mapping entry.
 ****************************************************************************/
-BOOL group_map_remove(DOM_SID sid)
+
+static BOOL group_map_remove(DOM_SID sid)
 {
        TDB_DATA kbuf, dbuf;
        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);
@@ -664,7 +392,8 @@ BOOL group_map_remove(DOM_SID sid)
        kbuf.dsize = strlen(key)+1;
                
        dbuf = tdb_fetch(tdb, kbuf);
-       if (!dbuf.dptr) return False;
+       if (!dbuf.dptr)
+               return False;
        
        SAFE_FREE(dbuf.dptr);
 
@@ -674,11 +403,11 @@ BOOL group_map_remove(DOM_SID sid)
        return True;
 }
 
-
 /****************************************************************************
-enumerate the group mapping
+ Enumerate the group mapping.
 ****************************************************************************/
-BOOL enum_group_mapping(enum SID_NAME_USE sid_name_use, GROUP_MAP **rmap,
+
+static BOOL enum_group_mapping(enum SID_NAME_USE sid_name_use, GROUP_MAP **rmap,
                        int *num_entries, BOOL unix_only)
 {
        TDB_DATA kbuf, dbuf, newkey;
@@ -688,8 +417,11 @@ BOOL enum_group_mapping(enum SID_NAME_USE sid_name_use, GROUP_MAP **rmap,
        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;
@@ -700,59 +432,43 @@ BOOL enum_group_mapping(enum SID_NAME_USE sid_name_use, GROUP_MAP **rmap,
 
                if (strncmp(kbuf.dptr, GROUP_PREFIX, strlen(GROUP_PREFIX)) != 0)
                        continue;
-               
+
                dbuf = tdb_fetch(tdb, kbuf);
                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.systemaccount);
-
-               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));
+               ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
+                                &map.gid, &map.sid_name_use, &map.nt_name, &map.comment);
 
                SAFE_FREE(dbuf.dptr);
-               if (ret != dbuf.dsize) {
-                       free_privilege(set);
+
+               if ( ret == -1 ) {
+                       DEBUG(3,("enum_group_mapping: tdb_unpack failure\n"));
                        continue;
                }
-
+       
                /* list only the type or everything if UNKNOWN */
                if (sid_name_use!=SID_NAME_UNKNOWN  && sid_name_use!=map.sid_name_use) {
-                       free_privilege(set);
+                       DEBUG(11,("enum_group_mapping: group %s is not of the requested type\n", map.nt_name));
                        continue;
                }
-               
+
                if (unix_only==ENUM_ONLY_MAPPED && map.gid==-1) {
-                       free_privilege(set);
+                       DEBUG(11,("enum_group_mapping: group %s is non mapped\n", map.nt_name));
                        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((*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
@@ -763,76 +479,16 @@ BOOL enum_group_mapping(enum SID_NAME_USE sid_name_use, GROUP_MAP **rmap,
                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].systemaccount=map.systemaccount;
-               mapt[entries].priv_set.count=set->count;
-               mapt[entries].priv_set.control=set->control;
-               mapt[entries].priv_set.set=set->set;
 
                entries++;
-       }
-
-       *num_entries=entries;
-       return True;
-}
-
-
-/****************************************************************************
-convert a privilege string to a privilege array
-****************************************************************************/
-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 */
-       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) {
-                               set.attr=0;
-                               set.luid.high=0;
-                               set.luid.low=privs[i].se_priv;
-                               add_privilege(se_priv, set);
-                       }
-               }               
-       }
-}
-
-/****************************************************************************
-convert a privilege array to a privilege string
-****************************************************************************/
-void convert_priv_to_text(PRIVILEGE_SET *se_priv, char *privilege)
-{
-       int i,j;
 
-       if (privilege==NULL)
-               return;
-
-       ZERO_STRUCTP(privilege);
-
-       if (check_empty_privilege(se_priv)) {
-               fstrcat(privilege, "No privilege");
-               return;
        }
 
-       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++;
-               }
+       *num_entries=entries;
 
-               fstrcat(privilege, privs[j].priv);
-               fstrcat(privilege, " ");
-       }
+       return True;
 }
 
-
 /*
  *
  * High level functions
@@ -848,27 +504,41 @@ void convert_priv_to_text(PRIVILEGE_SET *se_priv, char *privilege)
 BOOL get_domain_group_from_sid(DOM_SID sid, GROUP_MAP *map)
 {
        struct group *grp;
+       BOOL ret;
+       
+       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))
+       
+       become_root();
+       ret = pdb_getgrsid(map, sid);
+       unbecome_root();
+       
+       if ( !ret ) 
                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) {
                return False;
+       }
 
        DEBUG(10, ("get_domain_group_from_sid: SID is a domain group\n"));
        
-       if (map->gid==-1)
+       if (map->gid==-1) {
                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: SID is mapped to gid:%lu\n",(unsigned long)map->gid));
+       
+       grp = getgrgid(map->gid);
+       if ( !grp ) {
                DEBUG(10, ("get_domain_group_from_sid: gid DOESN'T exist in UNIX security\n"));
                return False;
        }
@@ -881,62 +551,92 @@ 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)
 {
-       struct group *grp;
+       BOOL ret;
+       
+       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)
-                       return False;
-       
-               if (map->gid==-1)
-                       return False;
-
-               if ( (grp=getgrgid(map->gid)) == NULL)
-                       return False;
-       } else {
+       become_root();
+       ret = pdb_getgrsid(map, *sid);
+       unbecome_root();
+       
+       if ( !ret )
+               return False;
+               
+       if ( (map->sid_name_use != SID_NAME_ALIAS)
+               || (map->gid == -1)
+               || (getgrgid(map->gid) == NULL) ) 
+       {
+               return False;
+       }               
+                       
+#if 1  /* JERRY */
+       /* local groups only exist in the group mapping DB so this 
+          is not necessary */
+          
+       else {
                /* the group isn't in the mapping table.
                 * make one based on the unix information */
                uint32 alias_rid;
+               struct group *grp;
 
-               sid_peek_rid(&sid, &alias_rid);
+               sid_peek_rid(sid, &alias_rid);
                map->gid=pdb_group_rid_to_gid(alias_rid);
-
-               if ((grp=getgrgid(map->gid)) == NULL)
+               
+               grp = getgrgid(map->gid);
+               if ( !grp ) {
+                       DEBUG(3,("get_local_group_from_sid: No unix group for [%ul]\n", map->gid));
                        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");
 
-               init_privilege(&map->priv_set);
-
-               sid_copy(&map->sid, &sid);
+               sid_copy(&map->sid, sid);
        }
+#endif
 
        return True;
 }
 
 /* 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)
 {
        struct group *grp;
+       BOOL ret;
+       
+
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
 
-       if(!get_group_map_from_sid(sid, map))
+       become_root();
+       ret = pdb_getgrsid(map, *sid);
+       unbecome_root();
+       
+       if ( !ret )
                return False;
 
-       if (map->sid_name_use!=SID_NAME_WKN_GRP)
+       if (map->sid_name_use!=SID_NAME_WKN_GRP) {
                return False;
+       }
 
-       if (map->gid==-1)
+       if (map->gid==-1) {
                return False;
+       }
 
-       if ( (grp=getgrgid(map->gid)) == NULL)
+       if ( (grp=getgrgid(map->gid)) == NULL) {
                return False;
+       }
 
        return True;
 }
@@ -949,6 +649,12 @@ Returns a GROUP_MAP struct based on the gid.
 BOOL get_group_from_gid(gid_t gid, GROUP_MAP *map)
 {
        struct group *grp;
+       BOOL ret;
+
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
 
        if ( (grp=getgrgid(gid)) == NULL)
                return False;
@@ -956,15 +662,18 @@ 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)) {
+       
+       become_root();
+       ret = pdb_getgrgid(map, gid);
+       unbecome_root();
+       
+       if ( !ret ) {
                map->gid=gid;
                map->sid_name_use=SID_NAME_ALIAS;
-               map->systemaccount=PR_ACCESS_FROM_NETWORK;
-               init_privilege(&map->priv_set);
 
                /* 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);
@@ -981,7 +690,7 @@ BOOL get_group_from_gid(gid_t gid, GROUP_MAP *map)
  Get the member users of a group and
  all the users who have that group as primary.
             
- give back an array of uid
+ give back an array of SIDS
  return the grand number of users
 
 
@@ -989,16 +698,23 @@ BOOL get_group_from_gid(gid_t gid, GROUP_MAP *map)
 
 ****************************************************************************/
         
-BOOL get_uid_list_of_group(gid_t gid, uid_t **uid, int *num_uids)
+BOOL get_sid_list_of_group(gid_t gid, DOM_SID **sids, int *num_sids)
 {
        struct group *grp;
-       struct passwd *pwd;
        int i=0;
        char *gr;
-       uid_t *u;
+       DOM_SID *s;
+
+       struct sys_pwent *userlist;
+       struct sys_pwent *user;
  
-       *num_uids = 0;
-       *uid=NULL;
+       if(!init_group_mapping()) {
+               DEBUG(0,("failed to initialize group mapping"));
+               return(False);
+       }
+
+       *num_sids = 0;
+       *sids=NULL;
        
        if ( (grp=getgrgid(gid)) == NULL)
                return False;
@@ -1007,38 +723,86 @@ BOOL get_uid_list_of_group(gid_t gid, uid_t **uid, int *num_uids)
        DEBUG(10, ("getting members\n"));
         
        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"));
+               SAM_ACCOUNT *group_member_acct = NULL;
+               BOOL found_user;
+               s = Realloc((*sids), sizeof(**sids)*(*num_sids+1));
+               if (!s) {
+                       DEBUG(0,("get_uid_list_of_group: unable to enlarge SID list!\n"));
                        return False;
                }
-               else (*uid) = u;
+               else (*sids) = s;
 
-               if( (pwd=getpwnam(gr)) !=NULL) {
-                       (*uid)[*num_uids]=pwd->pw_uid;
-                       (*num_uids)++;
+               if (!NT_STATUS_IS_OK(pdb_init_sam(&group_member_acct))) {
+                       continue;
                }
+
+               become_root();
+               found_user = pdb_getsampwnam(group_member_acct, gr);
+               unbecome_root();
+       
+               if (found_user) {
+                       sid_copy(&(*sids)[*num_sids], pdb_get_user_sid(group_member_acct));
+                       (*num_sids)++;
+               }
+       
+               pdb_free_sam(&group_member_acct);
+
                gr = grp->gr_mem[++i];
        }
-       DEBUG(10, ("got [%d] members\n", *num_uids));
-
-       setpwent();
-       while ((pwd=getpwent()) != NULL) {
-               if (pwd->pw_gid==gid) {
-                       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;
+       DEBUG(10, ("got [%d] members\n", *num_sids));
+
+       winbind_off();
+
+       user = userlist = getpwent_list();
 
-                       (*num_uids)++;
+       while (user != NULL) {
+
+               SAM_ACCOUNT *group_member_acct = NULL;
+               BOOL found_user;
+
+               if (user->pw_gid != gid) {
+                       user = user->next;
+                       continue;
                }
+
+               s = Realloc((*sids), sizeof(**sids)*(*num_sids+1));
+               if (!s) {
+                       DEBUG(0,("get_sid_list_of_group: unable to enlarge "
+                                "SID list!\n"));
+                       pwent_free(userlist);
+                       winbind_on();
+                       return False;
+               }
+               else (*sids) = s;
+                       
+               if (!NT_STATUS_IS_OK(pdb_init_sam(&group_member_acct))) {
+                       continue;
+               }
+                       
+               become_root();
+               found_user = pdb_getsampwnam(group_member_acct, user->pw_name);
+               unbecome_root();
+                       
+               if (found_user) {
+                       sid_copy(&(*sids)[*num_sids],
+                                pdb_get_user_sid(group_member_acct));
+                       (*num_sids)++;
+               } else {
+                       DEBUG(4,("get_sid_list_of_group: User %s [uid == %lu] "
+                                "has no samba account\n",
+                                user->pw_name, (unsigned long)user->pw_uid));
+                       if (algorithmic_uid_to_sid(&(*sids)[*num_sids],
+                                                  user->pw_uid))
+                               (*num_sids)++;
+               }
+               pdb_free_sam(&group_member_acct);
+
+               user = user->next;
        }
-       endpwent();
-       DEBUG(10, ("got primary groups, members: [%d]\n", *num_uids));
+       pwent_free(userlist);
+       DEBUG(10, ("got primary groups, members: [%d]\n", *num_sids));
 
+       winbind_on();
         return True;
 }
 
@@ -1046,17 +810,52 @@ BOOL get_uid_list_of_group(gid_t gid, uid_t **uid, int *num_uids)
  Create a UNIX group on demand.
 ****************************************************************************/
 
-int smb_create_group(char *unix_group)
+int smb_create_group(char *unix_group, gid_t *new_gid)
 {
        pstring add_script;
-       int ret;
+       int     ret = -1;
+       int     fd = 0;
+       
+       *new_gid = 0;
 
-       pstrcpy(add_script, lp_addgroup_script());
-       if (! *add_script) return -1;
-       pstring_sub(add_script, "%g", unix_group);
-       ret = smbrun(add_script,NULL);
-       DEBUG(3,("smb_create_group: Running the command `%s' gave %d\n",add_script,ret));
-       return ret;
+       /* defer to scripts */
+       
+       if ( *lp_addgroup_script() ) {
+               pstrcpy(add_script, lp_addgroup_script());
+               pstring_sub(add_script, "%g", unix_group);
+               ret = smbrun(add_script, (new_gid!=NULL) ? &fd : NULL);
+               DEBUG(3,("smb_create_group: Running the command `%s' gave %d\n",add_script,ret));
+               if (ret != 0)
+                       return ret;
+                       
+               if (fd != 0) {
+                       fstring output;
+
+                       *new_gid = 0;
+                       if (read(fd, output, sizeof(output)) > 0) {
+                               *new_gid = (gid_t)strtoul(output, NULL, 10);
+                       }
+                       
+                       close(fd);
+               }
+       }
+
+       /* Try winbindd */
+
+       if ( winbind_create_group( unix_group, NULL ) ) {
+               DEBUG(3,("smb_create_group: winbindd created the group (%s)\n",
+                       unix_group));
+               ret = 0;
+       }
+       
+       if (*new_gid == 0) {
+               struct group *grp = getgrnam(unix_group);
+
+               if (grp != NULL)
+                       *new_gid = grp->gr_gid;
+       }
+                       
+       return ret;     
 }
 
 /****************************************************************************
@@ -1068,16 +867,58 @@ int smb_delete_group(char *unix_group)
        pstring del_script;
        int ret;
 
-       pstrcpy(del_script, lp_delgroup_script());
-       if (! *del_script) return -1;
-       pstring_sub(del_script, "%g", unix_group);
-       ret = smbrun(del_script,NULL);
-       DEBUG(3,("smb_delete_group: Running the command `%s' gave %d\n",del_script,ret));
-       return ret;
+       /* defer to scripts */
+       
+       if ( *lp_delgroup_script() ) {
+               pstrcpy(del_script, lp_delgroup_script());
+               pstring_sub(del_script, "%g", unix_group);
+               ret = smbrun(del_script,NULL);
+               DEBUG(3,("smb_delete_group: Running the command `%s' gave %d\n",del_script,ret));
+               return ret;
+       }
+
+       if ( winbind_delete_group( unix_group ) ) {
+               DEBUG(3,("smb_delete_group: winbindd deleted the group (%s)\n",
+                       unix_group));
+               return 0;
+       }
+               
+       return -1;
 }
 
 /****************************************************************************
- Create a UNIX group on demand.
+ Set a user's primary UNIX group.
+****************************************************************************/
+int smb_set_primary_group(const char *unix_group, const char* unix_user)
+{
+       pstring add_script;
+       int ret;
+
+       /* defer to scripts */
+       
+       if ( *lp_setprimarygroup_script() ) {
+               pstrcpy(add_script, lp_setprimarygroup_script());
+               all_string_sub(add_script, "%g", unix_group, sizeof(add_script));
+               all_string_sub(add_script, "%u", unix_user, sizeof(add_script));
+               ret = smbrun(add_script,NULL);
+               DEBUG(3,("smb_set_primary_group: "
+                        "Running the command `%s' gave %d\n",add_script,ret));
+               return ret;
+       }
+
+       /* Try winbindd */
+       
+       if ( winbind_set_user_primary_group( unix_user, unix_group ) ) {
+               DEBUG(3,("smb_delete_group: winbindd set the group (%s) as the primary group for user (%s)\n",
+                       unix_group, unix_user));
+               return 0;
+       }               
+       
+       return -1;
+}
+
+/****************************************************************************
+ Add a user to a UNIX group.
 ****************************************************************************/
 
 int smb_add_user_group(char *unix_group, char *unix_user)
@@ -1085,32 +926,156 @@ int smb_add_user_group(char *unix_group, char *unix_user)
        pstring add_script;
        int ret;
 
-       pstrcpy(add_script, lp_addusertogroup_script());
-       if (! *add_script) return -1;
-       pstring_sub(add_script, "%g", unix_group);
-       pstring_sub(add_script, "%u", unix_user);
-       ret = smbrun(add_script,NULL);
-       DEBUG(3,("smb_add_user_group: Running the command `%s' gave %d\n",add_script,ret));
-       return ret;
+       /* defer to scripts */
+       
+       if ( *lp_addusertogroup_script() ) {
+               pstrcpy(add_script, lp_addusertogroup_script());
+               pstring_sub(add_script, "%g", unix_group);
+               pstring_sub(add_script, "%u", unix_user);
+               ret = smbrun(add_script,NULL);
+               DEBUG(3,("smb_add_user_group: Running the command `%s' gave %d\n",add_script,ret));
+               return ret;
+       }
+       
+       /* Try winbindd */
+
+       if ( winbind_add_user_to_group( unix_user, unix_group ) ) {
+               DEBUG(3,("smb_delete_group: winbindd added user (%s) to the group (%s)\n",
+                       unix_user, unix_group));
+               return -1;
+       }       
+       
+       return -1;
 }
 
 /****************************************************************************
- Delete a UNIX group on demand.
+ Delete a user from a UNIX group
 ****************************************************************************/
 
-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;
 
-       pstrcpy(del_script, lp_deluserfromgroup_script());
-       if (! *del_script) return -1;
-       pstring_sub(del_script, "%g", unix_group);
-       pstring_sub(del_script, "%u", unix_user);
-       ret = smbrun(del_script,NULL);
-       DEBUG(3,("smb_delete_user_group: Running the command `%s' gave %d\n",del_script,ret));
-       return ret;
+       /* defer to scripts */
+       
+       if ( *lp_deluserfromgroup_script() ) {
+               pstrcpy(del_script, lp_deluserfromgroup_script());
+               pstring_sub(del_script, "%g", unix_group);
+               pstring_sub(del_script, "%u", unix_user);
+               ret = smbrun(del_script,NULL);
+               DEBUG(3,("smb_delete_user_group: Running the command `%s' gave %d\n",del_script,ret));
+               return ret;
+       }
+       
+       /* Try winbindd */
+
+       if ( winbind_remove_user_from_group( unix_user, unix_group ) ) {
+               DEBUG(3,("smb_delete_group: winbindd removed user (%s) from the group (%s)\n",
+                       unix_user, unix_group));
+               return 0;
+       }
+       
+       return -1;
 }
 
 
+NTSTATUS pdb_default_getgrsid(struct pdb_methods *methods, GROUP_MAP *map,
+                                DOM_SID sid)
+{
+       return get_group_map_from_sid(sid, map) ?
+               NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+}
+
+NTSTATUS pdb_default_getgrgid(struct pdb_methods *methods, GROUP_MAP *map,
+                                gid_t gid)
+{
+       return get_group_map_from_gid(gid, map) ?
+               NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+}
+
+NTSTATUS pdb_default_getgrnam(struct pdb_methods *methods, GROUP_MAP *map,
+                                const char *name)
+{
+       return get_group_map_from_ntname(name, map) ?
+               NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+}
+
+NTSTATUS pdb_default_add_group_mapping_entry(struct pdb_methods *methods,
+                                               GROUP_MAP *map)
+{
+       return add_mapping_entry(map, TDB_INSERT) ?
+               NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+}
+
+NTSTATUS pdb_default_update_group_mapping_entry(struct pdb_methods *methods,
+                                                  GROUP_MAP *map)
+{
+       return add_mapping_entry(map, TDB_REPLACE) ?
+               NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+}
+
+NTSTATUS pdb_default_delete_group_mapping_entry(struct pdb_methods *methods,
+                                                  DOM_SID sid)
+{
+       return group_map_remove(sid) ?
+               NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+}
+
+NTSTATUS pdb_default_enum_group_mapping(struct pdb_methods *methods,
+                                          enum SID_NAME_USE sid_name_use,
+                                          GROUP_MAP **rmap, int *num_entries,
+                                          BOOL unix_only)
+{
+       return enum_group_mapping(sid_name_use, rmap, num_entries, unix_only) ?
+               NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+}
+
+/**********************************************************************
+ no ops for passdb backends that don't implement group mapping
+ *********************************************************************/
+
+NTSTATUS pdb_nop_getgrsid(struct pdb_methods *methods, GROUP_MAP *map,
+                                DOM_SID sid)
+{
+       return NT_STATUS_UNSUCCESSFUL;
+}
+
+NTSTATUS pdb_nop_getgrgid(struct pdb_methods *methods, GROUP_MAP *map,
+                                gid_t gid)
+{
+       return NT_STATUS_UNSUCCESSFUL;
+}
+
+NTSTATUS pdb_nop_getgrnam(struct pdb_methods *methods, GROUP_MAP *map,
+                                const char *name)
+{
+       return NT_STATUS_UNSUCCESSFUL;
+}
+
+NTSTATUS pdb_nop_add_group_mapping_entry(struct pdb_methods *methods,
+                                               GROUP_MAP *map)
+{
+       return NT_STATUS_UNSUCCESSFUL;
+}
+
+NTSTATUS pdb_nop_update_group_mapping_entry(struct pdb_methods *methods,
+                                                  GROUP_MAP *map)
+{
+       return NT_STATUS_UNSUCCESSFUL;
+}
+
+NTSTATUS pdb_nop_delete_group_mapping_entry(struct pdb_methods *methods,
+                                                  DOM_SID sid)
+{
+       return NT_STATUS_UNSUCCESSFUL;
+}
+
+NTSTATUS pdb_nop_enum_group_mapping(struct pdb_methods *methods,
+                                          enum SID_NAME_USE sid_name_use,
+                                          GROUP_MAP **rmap, int *num_entries,
+                                          BOOL unix_only)
+{
+       return NT_STATUS_UNSUCCESSFUL;
+}