The branch, master has been updated
via 14686e4 libcli/security Remove unused sec_acl_equal()
from caf77f7 s3: Use cli_setpathinfo in cli_posix_unlink_internal
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 14686e4b5a4faeed5868e2e16121acd47ff5ba43
Author: Andrew Bartlett <abart...@samba.org>
Date: Mon Oct 25 08:30:00 2010 +1100
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 <abart...@samba.org>
Autobuild-Date: Sun Oct 24 22:21:23 UTC 2010 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
libcli/security/secacl.c | 46 ----------------------------------------------
libcli/security/secacl.h | 1 -
2 files changed, 0 insertions(+), 47 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/security/secacl.c b/libcli/security/secacl.c
index 29afe46..9c04df8 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 9f1e8fa..90fafe9 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_*/
--
Samba Shared Repository
