libcli/security: Rename sids_contains_sid() to sids_contains_sid_attrs()

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/libcli/security/dom_sid.h b/libcli/security/dom_sid.h
index 7a03af79e7620d805faf931b86ca4e875900d3ec..534b4808ce52d35099bdfd3d74adb5c31c66fb16 100644 (file)
--- a/libcli/security/dom_sid.h
+++ b/libcli/security/dom_sid.h
@@ -141,9 +141,9 @@ void del_sid_from_array(const struct dom_sid *sid, struct dom_sid **sids,
 bool add_rid_to_array_unique(TALLOC_CTX *mem_ctx,
                             uint32_t rid, uint32_t **pp_rids, size_t *p_num);
 bool is_null_sid(const struct dom_sid *sid);
-bool sids_contains_sid(const struct auth_SidAttr *sids,
-                      const uint32_t num_sids,
-                      const struct dom_sid *sid,
-                      uint32_t attrs);
+bool sids_contains_sid_attrs(const struct auth_SidAttr *sids,
+                            const uint32_t num_sids,
+                            const struct dom_sid *sid,
+                            uint32_t attrs);
 
 #endif /*_DOM_SID_H_*/

diff --git a/libcli/security/util_sid.c b/libcli/security/util_sid.c
index f2eadd6ada69a25a41b314e40228305bcb16e0af..33886e788f70aaaf144ca982125f7712d38cd908 100644 (file)
--- a/libcli/security/util_sid.c
+++ b/libcli/security/util_sid.c
@@ -527,10 +527,10 @@ bool is_null_sid(const struct dom_sid *sid)
  * @param [in] attrs   The attributes of the SID.
  * @returns true if the array contains the SID.
  */
-bool sids_contains_sid(const struct auth_SidAttr *sids,
-                      const uint32_t num_sids,
-                      const struct dom_sid *sid,
-                      uint32_t attrs)
+bool sids_contains_sid_attrs(const struct auth_SidAttr *sids,
+                            const uint32_t num_sids,
+                            const struct dom_sid *sid,
+                            uint32_t attrs)
 {
        uint32_t i;
 

diff --git a/source4/dsdb/common/util_groups.c b/source4/dsdb/common/util_groups.c
index 00706b419039ff20e839efe6ae567d059cd9e516..27a87353469734120bd004a5afd882b6ff55ac42 100644 (file)
--- a/source4/dsdb/common/util_groups.c
+++ b/source4/dsdb/common/util_groups.c
@@ -163,8 +163,8 @@ NTSTATUS dsdb_expand_nested_groups(struct ldb_context *sam_ctx,
                }
 
                /* This is an O(n^2) linear search */
-               already_there = sids_contains_sid(*res_sids, *num_res_sids,
-                                                 &sid, sid_attrs);
+               already_there = sids_contains_sid_attrs(*res_sids, *num_res_sids,
+                                                       &sid, sid_attrs);
                if (already_there) {
                        talloc_free(tmp_ctx);
                        return NT_STATUS_OK;