Index: lib/util_sid.c
===================================================================
--- lib/util_sid.c	(revision 5865)
+++ lib/util_sid.c	(working copy)
@@ -652,7 +652,7 @@
  Add SID to an array SIDs
 ********************************************************************/
 
-void add_sid_to_array(const DOM_SID *sid, DOM_SID **sids, int *num)
+void add_sid_to_array(const DOM_SID *sid, DOM_SID **sids, unsigned int *num)
 {
 	*sids = SMB_REALLOC_ARRAY(*sids, DOM_SID, (*num)+1);
 
@@ -670,23 +670,23 @@
  Add SID to an array SIDs ensuring that it is not already there
 ********************************************************************/
 
-void add_sid_to_array_unique(const DOM_SID *sid, DOM_SID **sids, int *num_sids)
+void add_sid_to_array_unique(const DOM_SID *sid, DOM_SID **sids, unsigned int *num)
 {
 	int i;
 
-	for (i=0; i<(*num_sids); i++) {
+	for (i=0; i<(*num); i++) {
 		if (sid_compare(sid, &(*sids)[i]) == 0)
 			return;
 	}
 
-	add_sid_to_array(sid, sids, num_sids);
+	add_sid_to_array(sid, sids, num);
 }
 
 /********************************************************************
  Remove SID from an array
 ********************************************************************/
 
-void del_sid_from_array(const DOM_SID *sid, DOM_SID **sids, int *num)
+void del_sid_from_array(const DOM_SID *sid, DOM_SID **sids, unsigned int *num)
 {
 	DOM_SID *sid_list = *sids;
 	int i;
Index: groupdb/mapping.c
===================================================================
--- groupdb/mapping.c	(revision 5865)
+++ groupdb/mapping.c	(working copy)
@@ -486,7 +486,7 @@
  * store a list of aliases a SID is member of hanging off MEMBEROF/SID. */
 
 static NTSTATUS one_alias_membership(const DOM_SID *member,
-				     DOM_SID **sids, int *num)
+				     DOM_SID **sids, unsigned int *num)
 {
 	fstring key, string_sid;
 	TDB_DATA kbuf, dbuf;
@@ -529,7 +529,7 @@
 }
 
 static NTSTATUS alias_memberships(const DOM_SID *members, int num_members,
-				  DOM_SID **sids, int *num)
+				  DOM_SID **sids, unsigned int *num)
 {
 	int i;
 
@@ -547,7 +547,7 @@
 static BOOL is_aliasmem(const DOM_SID *alias, const DOM_SID *member)
 {
 	DOM_SID *sids;
-	int i, num;
+	int i; unsigned int num;
 
 	/* This feels the wrong way round, but the on-disk data structure
 	 * dictates it this way. */
@@ -622,7 +622,7 @@
 struct aliasmem_closure {
 	const DOM_SID *alias;
 	DOM_SID **sids;
-	int *num;
+	unsigned int *num;
 };
 
 static int collect_aliasmem(TDB_CONTEXT *tdb_ctx, TDB_DATA key, TDB_DATA data,
@@ -671,7 +671,7 @@
 	return 0;
 }
 
-static NTSTATUS enum_aliasmem(const DOM_SID *alias, DOM_SID **sids, int *num)
+static NTSTATUS enum_aliasmem(const DOM_SID *alias, DOM_SID **sids, unsigned int *num)
 {
 	GROUP_MAP map;
 	struct aliasmem_closure closure;
@@ -703,7 +703,7 @@
 {
 	NTSTATUS result;
 	DOM_SID *sids;
-	int i, num;
+	int i; unsigned int num;
 	BOOL found = False;
 	char *member_string;
 	TDB_DATA kbuf, dbuf;
@@ -1342,7 +1342,7 @@
 
 NTSTATUS pdb_default_enum_aliasmem(struct pdb_methods *methods,
 				   const DOM_SID *alias, DOM_SID **members,
-				   int *num_members)
+				   unsigned int *num_members)
 {
 	return enum_aliasmem(alias, members, num_members);
 }
@@ -1350,7 +1350,7 @@
 NTSTATUS pdb_default_alias_memberships(struct pdb_methods *methods,
 				       const DOM_SID *members,
 				       int num_members,
-				       DOM_SID **aliases, int *num)
+				       DOM_SID **aliases, unsigned int *num)
 {
 	return alias_memberships(members, num_members, aliases, num);
 }