Changeset 740 for vendor/current/libcli/security/secacl.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/libcli/security/secacl.c (modified) (2 diffs)

vendor/current/libcli/security/secacl.c

@@ -24 +24 @@
 #include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/security/secace.h"
+#include "libcli/security/secacl.h"
 
 #define  SEC_ACL_HEADER_SIZE (2 * sizeof(uint16_t) + sizeof(uint32_t))
@@ -76 +77 @@
         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;
-}