From 4e1b26db3490c6063bf0ea05b8ae7e34a96ca8a9 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Thu, 3 Jun 2004 09:25:01 +0000
Subject: r989: Calling sid_to_gid from within winbind makes no sense, as this
 calls winbind_sid_to_gid. For the consistency check, local_sid_to_gid must
 set the name_type it found.

Volker
(This used to be commit 5070c1b68f2add16916ba3135984f6e70bbe42cf)
---
 source3/nsswitch/winbindd_group.c | 10 +++++++++-
 source3/passdb/passdb.c           |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

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));
-- 
cgit