summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/nsswitch/winbindd_group.c10
-rw-r--r--source3/passdb/passdb.c1
2 files changed, 10 insertions, 1 deletions
diff --git a/source3/nsswitch/winbindd_group.c b/source3/nsswitch/winbindd_group.c
index 0e6c98e5d3..346a2711b6 100644
--- a/source3/nsswitch/winbindd_group.c
+++ b/source3/nsswitch/winbindd_group.c
@@ -963,9 +963,17 @@ static void add_local_gids_from_sid(DOM_SID *sid, gid_t **gids, int *num)
return;
for (j=0; j<num_aliases; j++) {
+ enum SID_NAME_USE type;
- if (!NT_STATUS_IS_OK(sid_to_gid(&aliases[j], &gid)))
+ if (!local_sid_to_gid(&gid, &aliases[j], &type)) {
+ DEBUG(1, ("Got an alias membership with no alias\n"));
continue;
+ }
+
+ if ((type != SID_NAME_ALIAS) && (type != SID_NAME_WKN_GRP)) {
+ DEBUG(1, ("Got an alias membership in a non-alias\n"));
+ continue;
+ }
add_gid_to_array_unique(gid, gids, num);
}
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 75f8171a25..c3a423c263 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -1287,6 +1287,7 @@ BOOL local_sid_to_gid(gid_t *pgid, const DOM_SID *psid, enum SID_NAME_USE *name_
}
*pgid = group.gid;
+ *name_type = group.sid_name_use;
DEBUG(10,("local_sid_to_gid: SID %s -> gid (%u)\n", sid_string_static(psid),
(unsigned int)*pgid));