From 31b806b5df0f2aeb7776c6b964a3b7e9acacf611 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Sun, 10 Apr 2005 14:20:29 +0000
Subject: r6273: Remove some unused code, minor cleanup (This used to be commit
 b451434e378e52e8ab6b932d7b26657ea9d0353c)

---
 source3/nsswitch/winbindd_group.c | 7 ++-----
 source3/nsswitch/winbindd_util.c  | 8 +-------
 2 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'source3/nsswitch')

diff --git a/source3/nsswitch/winbindd_group.c b/source3/nsswitch/winbindd_group.c
index 9c81aef447..f0d3bc43ea 100644
--- a/source3/nsswitch/winbindd_group.c
+++ b/source3/nsswitch/winbindd_group.c
@@ -924,7 +924,6 @@ static BOOL enum_alias_memberships(const DOM_SID *member_sid,
 				   DOM_SID **aliases, int *num_aliases)
 {
 	TALLOC_CTX *mem_ctx = talloc_init("enum_alias_memberships");
-	DOM_SID builtin_sid;
 
 	uint32 *rids = NULL;
 	int i, num_rids = 0;
@@ -948,15 +947,13 @@ static BOOL enum_alias_memberships(const DOM_SID *member_sid,
 		add_sid_to_array(NULL, &alias_sid, aliases, num_aliases);
 	}
 
-	string_to_sid(&builtin_sid, "S-1-5-32");
-
-	if (!pdb_enum_alias_memberships(mem_ctx, &builtin_sid,
+	if (!pdb_enum_alias_memberships(mem_ctx, &global_sid_Builtin,
 					member_sid, 1, &rids, &num_rids))
 		goto done;
 
 	for (i=0; i<num_rids; i++) {
 		DOM_SID alias_sid;
-		sid_copy(&alias_sid, &builtin_sid);
+		sid_copy(&alias_sid, &global_sid_Builtin);
 		sid_append_rid(&alias_sid, rids[i]);
 		add_sid_to_array(NULL, &alias_sid, aliases, num_aliases);
 	}
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index 686caf19f3..68560c040e 100644
--- a/source3/nsswitch/winbindd_util.c
+++ b/source3/nsswitch/winbindd_util.c
@@ -91,13 +91,7 @@ static BOOL is_internal_domain(const DOM_SID *sid)
 	if (sid == NULL)
 		return False;
 
-	if (sid_compare_domain(sid, get_global_sam_sid()) == 0)
-		return True;
-
-	if (sid_compare_domain(sid, &global_sid_Builtin) == 0)
-		return True;
-
-	return False;
+	return (sid_check_is_domain(sid) || sid_check_is_builtin(sid));
 }
 
 
-- 
cgit