libcli/security Remove unused sec_acl_equal()
authorAndrew Bartlett <abartlet@samba.org>
Sun, 24 Oct 2010 21:30:00 +0000 (08:30 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Sun, 24 Oct 2010 22:21:23 +0000 (22:21 +0000)
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 <abartlet@samba.org>
Autobuild-Date: Sun Oct 24 22:21:23 UTC 2010 on sn-devel-104

libcli/security/secacl.c
libcli/security/secacl.h

index 29afe460b16485a17b7796f4c04b60ca4b6b3ddd..9c04df81d1eacc5e286eaaa4bd146e6787f74536 100644 (file)
@@ -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;
-}
index 9f1e8fa183dc8ca70b37879e7c5b7f152b114f87..90fafe9e042a6ab64597b45527bdbc84effdf388 100644 (file)
@@ -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_*/