svn commit: samba r16350 - branches/SAMBA_3_0/source/lib branches/SAMBA_3_0/source/passdb trunk/source/lib trunk/source/passdb

[gd at samba.org]

Author: gd
Date: 2006-06-19 16:25:19 +0000 (Mon, 19 Jun 2006)
New Revision: 16350

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16350

Log:
Fix the build.

GUenther

Modified:
   branches/SAMBA_3_0/source/lib/util_sid.c
   branches/SAMBA_3_0/source/passdb/pdb_ldap.c
   trunk/source/lib/util_sid.c
   trunk/source/passdb/pdb_ldap.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/util_sid.c
===================================================================
--- branches/SAMBA_3_0/source/lib/util_sid.c	2006-06-19 16:00:32 UTC (rev 16349)
+++ branches/SAMBA_3_0/source/lib/util_sid.c	2006-06-19 16:25:19 UTC (rev 16350)
@@ -647,6 +647,25 @@
 	return;
 }
 
+void add_rid_to_array_unique(TALLOC_CTX *mem_ctx,
+				    uint32 rid, uint32 **pp_rids, size_t *p_num)
+{
+	size_t i;
+
+	for (i=0; i<*p_num; i++) {
+		if ((*pp_rids)[i] == rid)
+			return;
+	}
+	
+	*pp_rids = TALLOC_REALLOC_ARRAY(mem_ctx, *pp_rids, uint32, *p_num+1);
+
+	if (*pp_rids == NULL)
+		return;
+
+	(*pp_rids)[*p_num] = rid;
+	*p_num += 1;
+}
+
 BOOL is_null_sid(const DOM_SID *sid)
 {
 	static const DOM_SID null_sid = {0};

Modified: branches/SAMBA_3_0/source/passdb/pdb_ldap.c
===================================================================
--- branches/SAMBA_3_0/source/passdb/pdb_ldap.c	2006-06-19 16:00:32 UTC (rev 16349)
+++ branches/SAMBA_3_0/source/passdb/pdb_ldap.c	2006-06-19 16:25:19 UTC (rev 16350)
@@ -2274,25 +2274,6 @@
 	return ldapsam_getgroup(methods, filter, map);
 }
 
-static void add_rid_to_array_unique(TALLOC_CTX *mem_ctx,
-				    uint32 rid, uint32 **pp_rids, size_t *p_num)
-{
-	size_t i;
-
-	for (i=0; i<*p_num; i++) {
-		if ((*pp_rids)[i] == rid)
-			return;
-	}
-	
-	*pp_rids = TALLOC_REALLOC_ARRAY(mem_ctx, *pp_rids, uint32, *p_num+1);
-
-	if (*pp_rids == NULL)
-		return;
-
-	(*pp_rids)[*p_num] = rid;
-	*p_num += 1;
-}
-
 static BOOL ldapsam_extract_rid_from_entry(LDAP *ldap_struct,
 					   LDAPMessage *entry,
 					   const DOM_SID *domain_sid,

Modified: trunk/source/lib/util_sid.c
===================================================================
--- trunk/source/lib/util_sid.c	2006-06-19 16:00:32 UTC (rev 16349)
+++ trunk/source/lib/util_sid.c	2006-06-19 16:25:19 UTC (rev 16350)
@@ -647,6 +647,25 @@
 	return;
 }
 
+void add_rid_to_array_unique(TALLOC_CTX *mem_ctx,
+				    uint32 rid, uint32 **pp_rids, size_t *p_num)
+{
+	size_t i;
+
+	for (i=0; i<*p_num; i++) {
+		if ((*pp_rids)[i] == rid)
+			return;
+	}
+	
+	*pp_rids = TALLOC_REALLOC_ARRAY(mem_ctx, *pp_rids, uint32, *p_num+1);
+
+	if (*pp_rids == NULL)
+		return;
+
+	(*pp_rids)[*p_num] = rid;
+	*p_num += 1;
+}
+
 BOOL is_null_sid(const DOM_SID *sid)
 {
 	static const DOM_SID null_sid = {0};

Modified: trunk/source/passdb/pdb_ldap.c
===================================================================
--- trunk/source/passdb/pdb_ldap.c	2006-06-19 16:00:32 UTC (rev 16349)
+++ trunk/source/passdb/pdb_ldap.c	2006-06-19 16:25:19 UTC (rev 16350)
@@ -2275,25 +2275,6 @@
 	return ldapsam_getgroup(methods, filter, map);
 }
 
-static void add_rid_to_array_unique(TALLOC_CTX *mem_ctx,
-				    uint32 rid, uint32 **pp_rids, size_t *p_num)
-{
-	size_t i;
-
-	for (i=0; i<*p_num; i++) {
-		if ((*pp_rids)[i] == rid)
-			return;
-	}
-	
-	*pp_rids = TALLOC_REALLOC_ARRAY(mem_ctx, *pp_rids, uint32, *p_num+1);
-
-	if (*pp_rids == NULL)
-		return;
-
-	(*pp_rids)[*p_num] = rid;
-	*p_num += 1;
-}
-
 static BOOL ldapsam_extract_rid_from_entry(LDAP *ldap_struct,
 					   LDAPMessage *entry,
 					   const DOM_SID *domain_sid,