diff options
| -rw-r--r-- | libcli/security/secacl.c (renamed from source3/lib/secacl.c) | 34 | ||||
| -rw-r--r-- | source3/Makefile.in | 2 | ||||
| -rw-r--r-- | source3/include/rpc_secdes.h | 1 | ||||
| -rw-r--r-- | source4/libcli/security/config.mk | 3 |
4 files changed, 22 insertions, 18 deletions
diff --git a/source3/lib/secacl.c b/libcli/security/secacl.c index 5e82242e1b..45640773b0 100644 --- a/source3/lib/secacl.c +++ b/libcli/security/secacl.c @@ -21,18 +21,22 @@ */ #include "includes.h" +#include "libcli/security/security.h" + +#define SEC_ACL_HEADER_SIZE (2 * sizeof(uint16_t) + sizeof(uint32_t)) /******************************************************************* Create a SEC_ACL structure. ********************************************************************/ -SEC_ACL *make_sec_acl(TALLOC_CTX *ctx, enum security_acl_revision revision, - int num_aces, SEC_ACE *ace_list) +struct security_acl *make_sec_acl(TALLOC_CTX *ctx, + enum security_acl_revision revision, + int num_aces, struct security_ace *ace_list) { - SEC_ACL *dst; + struct security_acl *dst; int i; - if((dst = TALLOC_ZERO_P(ctx,SEC_ACL)) == NULL) + if((dst = talloc_zero(ctx, struct security_acl)) == NULL) return NULL; dst->revision = revision; @@ -46,7 +50,7 @@ SEC_ACL *make_sec_acl(TALLOC_CTX *ctx, enum security_acl_revision revision, positive number. */ if ((num_aces) && - ((dst->aces = TALLOC_ARRAY(ctx, SEC_ACE, num_aces)) + ((dst->aces = talloc_array(ctx, struct security_ace, num_aces)) == NULL)) { return NULL; } @@ -63,7 +67,7 @@ SEC_ACL *make_sec_acl(TALLOC_CTX *ctx, enum security_acl_revision revision, Duplicate a SEC_ACL structure. ********************************************************************/ -SEC_ACL *dup_sec_acl(TALLOC_CTX *ctx, SEC_ACL *src) +struct security_acl *dup_sec_acl(TALLOC_CTX *ctx, struct security_acl *src) { if(src == NULL) return NULL; @@ -75,44 +79,44 @@ SEC_ACL *dup_sec_acl(TALLOC_CTX *ctx, SEC_ACL *src) Compares two SEC_ACL structures ********************************************************************/ -bool sec_acl_equal(SEC_ACL *s1, SEC_ACL *s2) +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; + 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; + 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; + 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; + bool found = false; for (j = 0; j < s2->num_aces; j++) { if (sec_ace_equal(&s1->aces[i], &s2->aces[j])) { - found = True; + found = true; break; } } - if (!found) return False; + if (!found) return false; } - return True; + return true; } diff --git a/source3/Makefile.in b/source3/Makefile.in index 30990f4c54..f1272559b7 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -371,7 +371,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \ lib/module.o lib/events.o @LIBTEVENT_OBJ0@ \ lib/ldap_escape.o @CHARSET_STATIC@ \ lib/secdesc.o lib/util_seaccess.o ../libcli/security/secace.o \ - lib/secacl.o \ + ../libcli/security/secacl.o \ libads/krb5_errs.o lib/system_smbd.o lib/audit.o $(LIBNDR_OBJ) \ lib/file_id.o lib/idmap_cache.o \ ../libcli/security/dom_sid.o diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h index 37f7464a4a..c74d621f35 100644 --- a/source3/include/rpc_secdes.h +++ b/source3/include/rpc_secdes.h @@ -77,7 +77,6 @@ typedef struct security_ace SEC_ACE; #ifndef _SEC_ACL /* SEC_ACL */ typedef struct security_acl SEC_ACL; -#define SEC_ACL_HEADER_SIZE (2 * sizeof(uint16) + sizeof(uint32)) #define _SEC_ACL #endif diff --git a/source4/libcli/security/config.mk b/source4/libcli/security/config.mk index d99b83c2b5..d6d9ad5545 100644 --- a/source4/libcli/security/config.mk +++ b/source4/libcli/security/config.mk @@ -4,6 +4,7 @@ PUBLIC_DEPENDENCIES = LIBNDR LIBSECURITY_COMMON LIBSECURITY_OBJ_FILES = $(addprefix $(libclisrcdir)/security/, \ security_token.o security_descriptor.o \ access_check.o privilege.o sddl.o) \ - ../libcli/security/secace.o + ../libcli/security/secace.o \ + ../libcli/security/secacl.o $(eval $(call proto_header_template,$(libclisrcdir)/security/proto.h,$(LIBSECURITY_OBJ_FILES:.o=.c))) |