diff options
author | Günther Deschner <gd@samba.org> | 2006-06-19 16:25:19 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:17:37 -0500 |
commit | 17cbb65317d72646301194d4659b64fa198c3ae5 (patch) | |
tree | 1f0d9cf09f9a334564c0142486493c19e41851be | |
parent | c6a47bb4f31390ed975abc7b6788663e231193ba (diff) | |
download | samba-17cbb65317d72646301194d4659b64fa198c3ae5.tar.gz samba-17cbb65317d72646301194d4659b64fa198c3ae5.tar.bz2 samba-17cbb65317d72646301194d4659b64fa198c3ae5.zip |
r16350: Fix the build.
GUenther
(This used to be commit 3203ce3b49e6f21ed690e9d7393e98419de54c27)
-rw-r--r-- | source3/lib/util_sid.c | 19 | ||||
-rw-r--r-- | source3/passdb/pdb_ldap.c | 19 |
2 files changed, 19 insertions, 19 deletions
diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c index 307f3e3415..09fe30f81b 100644 --- a/source3/lib/util_sid.c +++ b/source3/lib/util_sid.c @@ -647,6 +647,25 @@ void del_sid_from_array(const DOM_SID *sid, DOM_SID **sids, size_t *num) 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}; diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index 3fd4e6748a..2a824c137f 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -2274,25 +2274,6 @@ static NTSTATUS ldapsam_getgrnam(struct pdb_methods *methods, GROUP_MAP *map, 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, |