From 14686e4b5a4faeed5868e2e16121acd47ff5ba43 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 25 Oct 2010 08:30:00 +1100 Subject: libcli/security Remove unused sec_acl_equal() This was orphaned by changing sec_desc_equal() to the stricter security_descriptor_equal() by f4195183a47b0e7c8bc9644d62b123f7880f3fcd in 2009. (The difference here was that sec_acl_equal allowed for equivilent ordering. I've checked the callers, and this function is only used to skip actual ACL sets, or to reference a cache, so this seems Autobuild-User: Andrew Bartlett Autobuild-Date: Sun Oct 24 22:21:23 UTC 2010 on sn-devel-104 --- libcli/security/secacl.c | 46 ---------------------------------------------- libcli/security/secacl.h | 1 - 2 files changed, 47 deletions(-) diff --git a/libcli/security/secacl.c b/libcli/security/secacl.c index 29afe460b1..9c04df81d1 100644 --- a/libcli/security/secacl.c +++ b/libcli/security/secacl.c @@ -75,49 +75,3 @@ struct security_acl *dup_sec_acl(TALLOC_CTX *ctx, struct security_acl *src) return make_sec_acl(ctx, src->revision, src->num_aces, src->aces); } - -/******************************************************************* - Compares two SEC_ACL structures -********************************************************************/ - -bool sec_acl_equal(struct security_acl *s1, struct security_acl *s2) -{ - unsigned int i, j; - - /* Trivial cases */ - - if (!s1 && !s2) return true; - if (!s1 || !s2) return false; - - /* Check top level stuff */ - - if (s1->revision != s2->revision) { - DEBUG(10, ("sec_acl_equal(): revision differs (%d != %d)\n", - s1->revision, s2->revision)); - return false; - } - - if (s1->num_aces != s2->num_aces) { - DEBUG(10, ("sec_acl_equal(): num_aces differs (%d != %d)\n", - s1->revision, s2->revision)); - return false; - } - - /* The ACEs could be in any order so check each ACE in s1 against - each ACE in s2. */ - - for (i = 0; i < s1->num_aces; i++) { - bool found = false; - - for (j = 0; j < s2->num_aces; j++) { - if (sec_ace_equal(&s1->aces[i], &s2->aces[j])) { - found = true; - break; - } - } - - if (!found) return false; - } - - return true; -} diff --git a/libcli/security/secacl.h b/libcli/security/secacl.h index 9f1e8fa183..90fafe9e04 100644 --- a/libcli/security/secacl.h +++ b/libcli/security/secacl.h @@ -26,7 +26,6 @@ struct security_acl *make_sec_acl(TALLOC_CTX *ctx, enum security_acl_revision revision, int num_aces, struct security_ace *ace_list); struct security_acl *dup_sec_acl(TALLOC_CTX *ctx, struct security_acl *src); -bool sec_acl_equal(struct security_acl *s1, struct security_acl *s2); #endif /*_SECACL_H_*/ -- cgit