trying to get HEAD building again. If you want the code
[abartlet/samba.git/.git] / source3 / nsswitch / winbindd_group.c
index 2412b12d71383c25d7343d38531dd6eda81fb205..d67d48d506626cc59cbab01e8791ce41da563153 100644 (file)
@@ -1,11 +1,11 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 2.2.
+   Unix SMB/CIFS implementation.
 
    Winbind daemon for ntdom nss module
 
    Copyright (C) Tim Potter 2000
    Copyright (C) Jeremy Allison 2001.
+   Copyright (C) Gerald (Jerry) Carter 2003.
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
 #include "winbindd.h"
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_WINBIND
+
+/*********************************************************************
+*********************************************************************/
+
+static int gr_mem_buffer( char **buffer, char **members, int num_members )
+{
+       int i;
+       int len = 0;
+       int idx = 0;
+
+       if ( num_members == 0 ) {
+               *buffer = NULL;
+               return 0;
+       }
+       
+       for ( i=0; i<num_members; i++ )
+               len += strlen(members[i])+1;
+
+       *buffer = (char*)smb_xmalloc(len);
+       for ( i=0; i<num_members; i++ ) {
+               snprintf( &(*buffer)[idx], len-idx, "%s,", members[i]);
+               idx += strlen(members[i])+1;
+       }
+       /* terminate with NULL */
+       (*buffer)[len-1] = '\0';
+       
+       return len;     
+}
+
 /***************************************************************
  Empty static struct for negative caching.
 ****************************************************************/
@@ -47,43 +78,47 @@ static BOOL fill_grent(struct winbindd_gr *gr, const char *dom_name,
        return True;
 }
 
-/* Fill in the group membership field of a NT group given by group_rid */
+/* Fill in the group membership field of a NT group given by group_sid */
 
 static BOOL fill_grent_mem(struct winbindd_domain *domain,
-                          uint32 group_rid, 
+                          DOM_SID *group_sid, 
                           enum SID_NAME_USE group_name_type, 
                           int *num_gr_mem, char **gr_mem, int *gr_mem_len)
 {
-       uint32 *rid_mem = NULL, num_names = 0;
+       DOM_SID **sid_mem = NULL;
+       uint32 num_names = 0;
        uint32 *name_types = NULL;
-       int buf_len, buf_ndx, i;
+       unsigned int buf_len, buf_ndx, i;
        char **names = NULL, *buf;
        BOOL result = False;
        TALLOC_CTX *mem_ctx;
        NTSTATUS status;
+       fstring sid_string;
 
-       if (!(mem_ctx = talloc_init_named("fill_grent_mem(%s)", domain->name)))
+       if (!(mem_ctx = talloc_init("fill_grent_mem(%s)", domain->name)))
                return False;
 
        /* Initialise group membership information */
        
-       DEBUG(10, ("group %s rid 0x%x\n", domain ? domain->name : "NULL", 
-                  group_rid));
+       DEBUG(10, ("group SID %s\n", sid_to_string(sid_string, group_sid)));
 
        *num_gr_mem = 0;
        
-       if (group_name_type != SID_NAME_DOM_GRP) {
-               DEBUG(1, ("rid %d in domain %s isn't a " "domain group\n", 
-                         group_rid, domain->name));
+       if ( !((group_name_type==SID_NAME_DOM_GRP) ||
+               ((group_name_type==SID_NAME_ALIAS) && strequal(lp_workgroup(), domain->name))) )
+       {
+               DEBUG(1, ("SID %s in domain %s isn't a domain group (%d)\n", 
+                         sid_to_string(sid_string, group_sid), domain->name, 
+                         group_name_type));
                 goto done;
        }
 
        /* Lookup group members */
-       status = domain->methods->lookup_groupmem(domain, mem_ctx, group_rid, &num_names, 
-                                                 &rid_mem, &names, &name_types);
+       status = domain->methods->lookup_groupmem(domain, mem_ctx, group_sid, &num_names, 
+                                                 &sid_mem, &names, &name_types);
        if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(1, ("could not lookup membership for group rid %d in domain %s\n", 
-                         group_rid, domain->name));
+               DEBUG(1, ("could not lookup membership for group rid %s in domain %s (error: %s)\n", 
+                         sid_to_string(sid_string, group_sid), domain->name, nt_errstr(status)));
 
                goto done;
        }
@@ -92,7 +127,7 @@ static BOOL fill_grent_mem(struct winbindd_domain *domain,
 
        if (DEBUGLEVEL >= 10) {
                for (i = 0; i < num_names; i++)
-                       DEBUG(10, ("\t%20s %x %d\n", names[i], rid_mem[i],
+                       DEBUG(10, ("\t%20s %s %d\n", names[i], sid_to_string(sid_string, sid_mem[i]),
                                   name_types[i]));
        }
 
@@ -151,7 +186,7 @@ static BOOL fill_grent_mem(struct winbindd_domain *domain,
 
        /* Allocate buffer */
 
-       if (!buf) {
+       if (!buf && buf_len != 0) {
                if (!(buf = malloc(buf_len))) {
                        DEBUG(1, ("out of memory\n"));
                        result = False;
@@ -186,14 +221,17 @@ done:
 enum winbindd_result winbindd_getgrnam(struct winbindd_cli_state *state)
 {
        DOM_SID group_sid;
+       WINBINDD_GR *grp;
        struct winbindd_domain *domain;
        enum SID_NAME_USE name_type;
-       uint32 group_rid;
        fstring name_domain, name_group;
        char *tmp, *gr_mem;
-       gid_t gid;
        int gr_mem_len;
+       gid_t gid;
        
+       /* Ensure null termination */
+       state->request.data.groupname[sizeof(state->request.data.groupname)-1]='\0';
+
        DEBUG(3, ("[%5d]: getgrnam %s\n", state->pid,
                  state->request.data.groupname));
 
@@ -202,9 +240,39 @@ enum winbindd_result winbindd_getgrnam(struct winbindd_cli_state *state)
        memset(name_group, 0, sizeof(fstring));
 
        tmp = state->request.data.groupname;
-       if (!parse_domain_user(tmp, name_domain, name_group))
+       
+       parse_domain_user(tmp, name_domain, name_group);
+
+       /* if no domain or our local domain, then do a local tdb search */
+       
+       if ( !*name_domain || strequal(name_domain, get_global_sam_name()) ) {
+               char *buffer = NULL;
+               
+               if ( !(grp=wb_getgrnam(name_group)) ) {
+                       DEBUG(5,("winbindd_getgrnam: lookup for %s\\%s failed\n",
+                               name_domain, name_group));
+                       return WINBINDD_ERROR;
+               }
+               memcpy( &state->response.data.gr, grp, sizeof(WINBINDD_GR) );
+
+               gr_mem_len = gr_mem_buffer( &buffer, grp->gr_mem, grp->num_gr_mem );
+               
+               state->response.data.gr.gr_mem_ofs = 0;
+               state->response.length += gr_mem_len;
+               state->response.extra_data = buffer;    /* give the memory away */
+               
+               return WINBINDD_OK;
+       }
+
+       /* should we deal with users for our domain? */
+       
+       if ( lp_winbind_trusted_domains_only() && strequal(name_domain, lp_workgroup())) {
+               DEBUG(7,("winbindd_getgrnam: My domain -- rejecting getgrnam() for %s\\%s.\n", 
+                       name_domain, name_group));
                return WINBINDD_ERROR;
+       }       
 
+       
        /* Get info for the domain */
 
        if ((domain = find_domain_from_name(name_domain)) == NULL) {
@@ -222,24 +290,22 @@ enum winbindd_result winbindd_getgrnam(struct winbindd_cli_state *state)
                return WINBINDD_ERROR;
        }
 
-       if ((name_type != SID_NAME_ALIAS) && (name_type != SID_NAME_DOM_GRP)) {
+       if ( !((name_type==SID_NAME_DOM_GRP) ||
+               ((name_type==SID_NAME_ALIAS) && strequal(lp_workgroup(), domain->name))) )
+       {
                DEBUG(1, ("name '%s' is not a local or domain group: %d\n", 
                          name_group, name_type));
                return WINBINDD_ERROR;
        }
 
-       /* Fill in group structure */
-
-       sid_split_rid(&group_sid, &group_rid);
-
-       if (!winbindd_idmap_get_gid_from_rid(domain->name, group_rid, &gid)) {
+       if (!NT_STATUS_IS_OK(idmap_sid_to_gid(&group_sid, &gid, 0))) {
                DEBUG(1, ("error converting unix gid to sid\n"));
                return WINBINDD_ERROR;
        }
 
        if (!fill_grent(&state->response.data.gr, name_domain,
                        name_group, gid) ||
-           !fill_grent_mem(domain, group_rid, name_type,
+           !fill_grent_mem(domain, &group_sid, name_type,
                            &state->response.data.gr.num_gr_mem,
                            &gr_mem, &gr_mem_len)) {
                return WINBINDD_ERROR;
@@ -260,11 +326,11 @@ enum winbindd_result winbindd_getgrnam(struct winbindd_cli_state *state)
 enum winbindd_result winbindd_getgrgid(struct winbindd_cli_state *state)
 {
        struct winbindd_domain *domain;
+       WINBINDD_GR *grp;
        DOM_SID group_sid;
        enum SID_NAME_USE name_type;
        fstring dom_name;
        fstring group_name;
-       uint32 group_rid;
        int gr_mem_len;
        char *gr_mem;
 
@@ -277,37 +343,55 @@ enum winbindd_result winbindd_getgrgid(struct winbindd_cli_state *state)
            (state->request.data.gid > server_state.gid_high))
                return WINBINDD_ERROR;
 
-       /* Get rid from gid */
+       /* alway try local tdb lookup first */
+       if ( ( grp=wb_getgrgid(state->request.data.gid)) != NULL ) {
+               char *buffer = NULL;
+               
+               memcpy( &state->response.data.gr, grp, sizeof(WINBINDD_GR) );
+               
+               gr_mem_len = gr_mem_buffer( &buffer, grp->gr_mem, grp->num_gr_mem );
+               
+               state->response.data.gr.gr_mem_ofs = 0;
+               state->response.length += gr_mem_len;
+               state->response.extra_data = buffer;    /* give away the memory */
+               
+               return WINBINDD_OK;
+       }
 
-       if (!winbindd_idmap_get_rid_from_gid(state->request.data.gid, 
-                                            &group_rid, &domain)) {
+       /* Get rid from gid */
+       if (!NT_STATUS_IS_OK(idmap_gid_to_sid(&group_sid, state->request.data.gid))) {
                DEBUG(1, ("could not convert gid %d to rid\n", 
                          state->request.data.gid));
                return WINBINDD_ERROR;
        }
 
-       /* Get sid from gid */
-
-       sid_copy(&group_sid, &domain->sid);
-       sid_append_rid(&group_sid, group_rid);
+       /* Get name from sid */
 
        if (!winbindd_lookup_name_by_sid(&group_sid, dom_name, group_name, &name_type)) {
                DEBUG(1, ("could not lookup sid\n"));
                return WINBINDD_ERROR;
        }
 
-       if (!((name_type == SID_NAME_ALIAS) || 
-             (name_type == SID_NAME_DOM_GRP))) {
+       /* Fill in group structure */
+
+       domain = find_domain_from_sid(&group_sid);
+
+       if (!domain) {
+               DEBUG(1,("Can't find domain from sid\n"));
+               return WINBINDD_ERROR;
+       }
+
+       if ( !((name_type==SID_NAME_DOM_GRP) ||
+               ((name_type==SID_NAME_ALIAS) && strequal(lp_workgroup(), domain->name))) )
+       {
                DEBUG(1, ("name '%s' is not a local or domain group: %d\n", 
                          group_name, name_type));
                return WINBINDD_ERROR;
        }
 
-       /* Fill in group structure */
-
        if (!fill_grent(&state->response.data.gr, dom_name, group_name, 
                        state->request.data.gid) ||
-           !fill_grent_mem(domain, group_rid, name_type,
+           !fill_grent_mem(domain, &group_sid, name_type,
                            &state->response.data.gr.num_gr_mem,
                            &gr_mem, &gr_mem_len))
                return WINBINDD_ERROR;
@@ -351,18 +435,23 @@ enum winbindd_result winbindd_setgrent(struct winbindd_cli_state *state)
        for (domain = domain_list(); domain != NULL; domain = domain->next) {
                struct getent_state *domain_state;
                
-               /* Skip domains other than WINBINDD_DOMAIN environment 
-                  variable */
                
-               if ((strcmp(state->request.domain, "") != 0) &&
-                   !check_domain_env(state->request.domain, domain->name))
-                       continue;
+               /* don't add our domaina if we are a PDC or if we 
+                  are a member of a Samba domain */
                
+               if ( (IS_DC || lp_winbind_trusted_domains_only())
+                       && strequal(domain->name, lp_workgroup()) )
+               {
+                       continue;
+               }
+                                               
                /* Create a state record for this domain */
                
                if ((domain_state = (struct getent_state *)
-                    malloc(sizeof(struct getent_state))) == NULL)
+                    malloc(sizeof(struct getent_state))) == NULL) {
+                       DEBUG(1, ("winbindd_setgrent: malloc failed for domain_state!\n"));
                        return WINBINDD_ERROR;
+               }
                
                ZERO_STRUCTP(domain_state);
                
@@ -399,7 +488,7 @@ static BOOL get_sam_group_entries(struct getent_state *ent)
 {
        NTSTATUS status;
        uint32 num_entries;
-       struct acct_info *name_list = NULL;
+       struct acct_info *name_list = NULL, *tmp_name_list = NULL;
        TALLOC_CTX *mem_ctx;
        BOOL result = False;
        struct acct_info *sam_grp_entries = NULL;
@@ -408,9 +497,11 @@ static BOOL get_sam_group_entries(struct getent_state *ent)
        if (ent->got_sam_entries)
                return False;
 
-       if (!(mem_ctx = talloc_init_named("get_sam_group_entries(%s)",
-                                         ent->domain_name)))
+       if (!(mem_ctx = talloc_init("get_sam_group_entries(%s)",
+                                         ent->domain_name))) {
+               DEBUG(1, ("get_sam_group_entries: could not create talloc context!\n")); 
                return False;
+       }
                
        /* Free any existing group info */
 
@@ -427,12 +518,12 @@ static BOOL get_sam_group_entries(struct getent_state *ent)
                goto done;
        }
 
-       status = domain->methods->enum_dom_groups(domain,
-                                                 mem_ctx, 
-                                                 &num_entries,
-                                                 &sam_grp_entries);
+       /* always get the domain global groups */
+
+       status = domain->methods->enum_dom_groups(domain, mem_ctx, &num_entries, &sam_grp_entries);
        
        if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(3, ("get_sam_group_entries: could not enumerate domain groups! Error: %s\n", nt_errstr(status)));
                result = False;
                goto done;
        }
@@ -440,12 +531,55 @@ static BOOL get_sam_group_entries(struct getent_state *ent)
        /* Copy entries into return buffer */
 
        if (num_entries) {
-               name_list = malloc(sizeof(struct acct_info) * num_entries);
-               memcpy(name_list, sam_grp_entries, 
-                      num_entries * sizeof(struct acct_info));
+               if ( !(name_list = malloc(sizeof(struct acct_info) * num_entries)) ) {
+                       DEBUG(0,("get_sam_group_entries: Failed to malloc memory for %d domain groups!\n", 
+                               num_entries));
+                       result = False;
+                       goto done;
+               }
+               memcpy( name_list, sam_grp_entries, num_entries * sizeof(struct acct_info) );
        }
        
        ent->num_sam_entries = num_entries;
+       
+       /* get the domain local groups if we are a member of a native win2k domain
+          and are not using LDAP to get the groups */
+          
+       if ( lp_security() != SEC_ADS && domain->native_mode 
+               && strequal(lp_workgroup(), domain->name) )
+       {
+               DEBUG(4,("get_sam_group_entries: Native Mode 2k domain; enumerating local groups as well\n"));
+               
+               status = domain->methods->enum_local_groups(domain, mem_ctx, &num_entries, &sam_grp_entries);
+               
+               if ( !NT_STATUS_IS_OK(status) ) { 
+                       DEBUG(3,("get_sam_group_entries: Failed to enumerate domain local groups!\n"));
+                       num_entries = 0;
+               }
+               else
+                       DEBUG(4,("get_sam_group_entries: Returned %d local groups\n", num_entries));
+               
+               /* Copy entries into return buffer */
+
+               if ( num_entries ) {
+                       if ( !(tmp_name_list = Realloc( name_list, sizeof(struct acct_info) * (ent->num_sam_entries+num_entries))) )
+                       {
+                               DEBUG(0,("get_sam_group_entries: Failed to realloc more memory for %d local groups!\n", 
+                                       num_entries));
+                               result = False;
+                               SAFE_FREE( name_list );
+                               goto done;
+                       }
+                       
+                       name_list = tmp_name_list;
+                               
+                       memcpy( &name_list[ent->num_sam_entries], sam_grp_entries, 
+                               num_entries * sizeof(struct acct_info) );
+               }
+       
+               ent->num_sam_entries += num_entries;
+       }
+       
                
        /* Fill in remaining fields */
 
@@ -500,7 +634,9 @@ enum winbindd_result winbindd_getgrent(struct winbindd_cli_state *state)
                gid_t group_gid;
                int gr_mem_len;
                char *gr_mem, *new_gr_mem_list;
-               
+               DOM_SID group_sid;
+               struct winbindd_domain *domain;
+                               
                /* Do we need to fetch another chunk of groups? */
 
        tryagain:
@@ -534,16 +670,23 @@ enum winbindd_result winbindd_getgrent(struct winbindd_cli_state *state)
                
                name_list = ent->sam_entries;
                
+               if (!(domain = 
+                     find_domain_from_name(ent->domain_name))) {
+                       DEBUG(3, ("No such domain %s in winbindd_getgrent\n", ent->domain_name));
+                       result = False;
+                       goto done;
+               }
+
                /* Lookup group info */
                
-               if (!winbindd_idmap_get_gid_from_rid(
-                       ent->domain_name,
-                       name_list[ent->sam_entry_index].rid,
-                       &group_gid)) {
+               sid_copy(&group_sid, &domain->sid);
+               sid_append_rid(&group_sid, name_list[ent->sam_entry_index].rid);
+
+               if (!NT_STATUS_IS_OK(idmap_sid_to_gid(&group_sid, &group_gid, 0))) {
                        
                        DEBUG(1, ("could not look up gid for group %s\n", 
                                  name_list[ent->sam_entry_index].acct_name));
-
+                       
                        ent->sam_entry_index++;
                        goto tryagain;
                }
@@ -564,23 +707,24 @@ enum winbindd_result winbindd_getgrent(struct winbindd_cli_state *state)
                /* Fill in group membership entry */
 
                if (result) {
-                       struct winbindd_domain *domain;
-
-                       if (!(domain = 
-                             find_domain_from_name(ent->domain_name))) {
-                               DEBUG(3, ("No such domain %s in winbindd_getgrent\n", ent->domain_name));
-                               result = False;
-                               goto done;
-                       }
-
-                       /* Get group membership */
+                       DOM_SID member_sid;
+                       group_list[group_list_ndx].num_gr_mem = 0;
+                       gr_mem = NULL;
+                       gr_mem_len = 0;
                        
-                       result = fill_grent_mem(
-                               domain,
-                               name_list[ent->sam_entry_index].rid,
-                               SID_NAME_DOM_GRP,
-                               &group_list[group_list_ndx].num_gr_mem, 
-                               &gr_mem, &gr_mem_len);
+                       /* Get group membership */                      
+                       if (state->request.cmd == WINBINDD_GETGRLST) {
+                               result = True;
+                       } else {
+                               sid_copy(&member_sid, &domain->sid);
+                               sid_append_rid(&member_sid, name_list[ent->sam_entry_index].rid);
+                               result = fill_grent_mem(
+                                       domain,
+                                       &member_sid,
+                                       SID_NAME_DOM_GRP,
+                                       &group_list[group_list_ndx].num_gr_mem, 
+                                       &gr_mem, &gr_mem_len);
+                       }
                }
 
                if (result) {
@@ -679,7 +823,7 @@ enum winbindd_result winbindd_list_groups(struct winbindd_cli_state *state)
        struct winbindd_domain *domain;
        char *extra_data = NULL;
        char *ted = NULL;
-       int extra_data_len = 0, i;
+       unsigned int extra_data_len = 0, i;
 
        DEBUG(3, ("[%5d]: list groups\n", state->pid));
 
@@ -690,14 +834,8 @@ enum winbindd_result winbindd_list_groups(struct winbindd_cli_state *state)
 
                ZERO_STRUCT(groups);
 
-               /* Skip domains other than WINBINDD_DOMAIN environment
-                  variable */ 
-               if ((strcmp(state->request.domain, "") != 0) &&
-                   !check_domain_env(state->request.domain, domain->name))
-                       continue;
-
                /* Get list of sam groups */
-               ZERO_STRUCT(groups);
+               
                fstrcpy(groups.domain_name, domain->name);
 
                get_sam_group_entries(&groups);
@@ -753,33 +891,45 @@ enum winbindd_result winbindd_list_groups(struct winbindd_cli_state *state)
 }
 
 /* Get user supplementary groups.  This is much quicker than trying to
-   invert the groups database. */
+   invert the groups database.  We merge the groups from the gids and
+   other_sids info3 fields as trusted domain, universal group
+   memberships, and nested groups (win2k native mode only) are not
+   returned by the getgroups RPC call but are present in the info3. */
 
 enum winbindd_result winbindd_getgroups(struct winbindd_cli_state *state)
 {
        fstring name_domain, name_user;
-       DOM_SID user_sid;
+       DOM_SID user_sid, group_sid;
        enum SID_NAME_USE name_type;
-       uint32 user_rid, num_groups, num_gids;
+       uint32 num_groups = 0;
+       uint32 num_gids = 0;
        NTSTATUS status;
-       uint32 *user_gids;
+       DOM_SID **user_grpsids;
        struct winbindd_domain *domain;
        enum winbindd_result result = WINBINDD_ERROR;
        gid_t *gid_list;
-       int i;
+       unsigned int i;
        TALLOC_CTX *mem_ctx;
+       NET_USER_INFO_3 *info3 = NULL;
        
+       /* Ensure null termination */
+       state->request.data.username[sizeof(state->request.data.username)-1]='\0';
+
        DEBUG(3, ("[%5d]: getgroups %s\n", state->pid,
                  state->request.data.username));
 
-       if (!(mem_ctx = talloc_init_named("winbindd_getgroups(%s)",
+       if (!(mem_ctx = talloc_init("winbindd_getgroups(%s)",
                                          state->request.data.username)))
                return WINBINDD_ERROR;
 
        /* Parse domain and username */
 
-       if (!parse_domain_user(state->request.data.username, name_domain, 
-                         name_user))
+       parse_domain_user(state->request.data.username, 
+               name_domain, name_user);
+       
+       /* bail if there is no domain */ 
+       
+       if ( !*name_domain )
                goto done;
 
        /* Get info for the domain */
@@ -804,32 +954,109 @@ enum winbindd_result winbindd_getgroups(struct winbindd_cli_state *state)
                goto done;
        }
 
-       sid_split_rid(&user_sid, &user_rid);
+       /* Treat the info3 cache as authoritative as the
+          lookup_usergroups() function may return cached data. */
 
-       status = domain->methods->lookup_usergroups(domain, mem_ctx, user_rid, &num_groups, &user_gids);
-       if (!NT_STATUS_IS_OK(status)) goto done;
+       if ((info3 = netsamlogon_cache_get(mem_ctx, &user_sid))) {
 
-       /* Copy data back to client */
+               DEBUG(10, ("winbindd_getgroups: info3 has %d groups, %d other sids\n",
+                          info3->num_groups2, info3->num_other_sids));
 
-       num_gids = 0;
-       gid_list = malloc(sizeof(gid_t) * num_groups);
+               num_groups = info3->num_other_sids + info3->num_groups2;
+               gid_list = calloc(sizeof(gid_t), num_groups);
 
-       if (state->response.extra_data)
-               goto done;
+               /* Go through each other sid and convert it to a gid */
 
-       for (i = 0; i < num_groups; i++) {
-               if (!winbindd_idmap_get_gid_from_rid(domain->name, 
-                                                    user_gids[i], 
-                                                    &gid_list[num_gids])) {
+               for (i = 0; i < info3->num_other_sids; i++) {
+                       fstring name;
+                       fstring dom_name;
+                       enum SID_NAME_USE sid_type;
+
+                       /* Is this sid known to us?  It can either be
+                           a trusted domain sid or a foreign sid. */
+
+                       if (!winbindd_lookup_name_by_sid( &info3->other_sids[i].sid, 
+                               dom_name, name, &sid_type))
+                       {
+                               DEBUG(10, ("winbindd_getgroups: could not lookup name for %s\n", 
+                                          sid_string_static(&info3->other_sids[i].sid)));
+                               continue;
+                       }
 
-                       DEBUG(1, ("unable to convert group rid %d to gid\n", 
-                                 user_gids[i]));
-                       continue;
+                       /* Check it is a domain group or an alias (domain local group) 
+                          in a win2k native mode domain. */
+                       
+                       if ( !((sid_type==SID_NAME_DOM_GRP) ||
+                               ((sid_type==SID_NAME_ALIAS) && strequal(lp_workgroup(), domain->name))) )
+                       {
+                               DEBUG(10, ("winbindd_getgroups: sid type %d "
+                                          "for %s is not a domain group\n",
+                                          sid_type,
+                                          sid_string_static(
+                                                  &info3->other_sids[i].sid)));
+                               continue;
+                       }
+
+                       /* Map to a gid */
+
+                       if (!NT_STATUS_IS_OK(idmap_sid_to_gid(&info3->other_sids[i].sid, &gid_list[num_gids], 0)) )
+                       {
+                               DEBUG(10, ("winbindd_getgroups: could not map sid %s to gid\n",
+                                          sid_string_static(&info3->other_sids[i].sid)));
+                               continue;
+                       }
+
+                       /* We've jumped through a lot of hoops to get here */
+
+                       DEBUG(10, ("winbindd_getgroups: mapped other sid %s to "
+                                  "gid %d\n", sid_string_static(
+                                          &info3->other_sids[i].sid),
+                                  gid_list[num_gids]));
+
+                       num_gids++;
                }
+
+               for (i = 0; i < info3->num_groups2; i++) {
+               
+                       /* create the group SID */
                        
-               num_gids++;
+                       sid_copy( &group_sid, &domain->sid );
+                       sid_append_rid( &group_sid, info3->gids[i].g_rid );
+
+                       if (!NT_STATUS_IS_OK(idmap_sid_to_gid(&group_sid, &gid_list[num_gids], 0)) ) {
+                               DEBUG(10, ("winbindd_getgroups: could not map sid %s to gid\n",
+                                          sid_string_static(&group_sid)));
+                       }
+
+                       num_gids++;
+               }
+
+               SAFE_FREE(info3);
+
+       } else {
+               status = domain->methods->lookup_usergroups(domain, mem_ctx, 
+                                                   &user_sid, &num_groups, 
+                                                   &user_grpsids);
+               if (!NT_STATUS_IS_OK(status)) 
+                       goto done;
+
+               gid_list = malloc(sizeof(gid_t) * num_groups);
+
+               if (state->response.extra_data)
+                       goto done;
+
+               for (i = 0; i < num_groups; i++) {
+                       if (!NT_STATUS_IS_OK(idmap_sid_to_gid(user_grpsids[i], &gid_list[num_gids], 0))) {
+                               DEBUG(1, ("unable to convert group sid %s to gid\n", 
+                                         sid_string_static(user_grpsids[i])));
+                               continue;
+                       }
+                       num_gids++;
+               }
        }
 
+       /* Send data back to client */
+
        state->response.data.num_entries = num_gids;
        state->response.extra_data = gid_list;
        state->response.length += num_gids * sizeof(gid_t);