diff options
| author | Günther Deschner <gd@samba.org> | 2010-05-18 03:25:38 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-05-18 12:30:11 +0200 |
| commit | a8b01d1f3b4025af7e7a9d8b61deec6156737322 (patch) | |
| tree | 46f560cfd41acc773857a0cd890fa09e9862a2ef /source3/lib/secdesc.c | |
| parent | 8bc9c343c4fe4e6f6c0283fd15e86caf6b8c1085 (diff) | |
| download | samba-a8b01d1f3b4025af7e7a9d8b61deec6156737322.tar.gz samba-a8b01d1f3b4025af7e7a9d8b61deec6156737322.tar.bz2 samba-a8b01d1f3b4025af7e7a9d8b61deec6156737322.zip | |
s3-secdesc: remove "typedef struct security_ace SEC_ACE".
Guenther
Diffstat (limited to 'source3/lib/secdesc.c')
| -rw-r--r-- | source3/lib/secdesc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source3/lib/secdesc.c b/source3/lib/secdesc.c index b3505e7e1b..a540aa684c 100644 --- a/source3/lib/secdesc.c +++ b/source3/lib/secdesc.c @@ -413,7 +413,7 @@ NTSTATUS sec_desc_add_sid(TALLOC_CTX *ctx, SEC_DESC **psd, DOM_SID *sid, uint32 { SEC_DESC *sd = 0; SEC_ACL *dacl = 0; - SEC_ACE *ace = 0; + struct security_ace *ace = 0; NTSTATUS status; if (!ctx || !psd || !sid || !sd_size) @@ -465,7 +465,7 @@ NTSTATUS sec_desc_del_sid(TALLOC_CTX *ctx, SEC_DESC **psd, DOM_SID *sid, size_t { SEC_DESC *sd = 0; SEC_ACL *dacl = 0; - SEC_ACE *ace = 0; + struct security_ace *ace = 0; NTSTATUS status; if (!ctx || !psd[0] || !sid || !sd_size) @@ -491,10 +491,10 @@ NTSTATUS sec_desc_del_sid(TALLOC_CTX *ctx, SEC_DESC **psd, DOM_SID *sid, size_t } /* - * Determine if an ACE is inheritable + * Determine if an struct security_ace is inheritable */ -static bool is_inheritable_ace(const SEC_ACE *ace, +static bool is_inheritable_ace(const struct security_ace *ace, bool container) { if (!container) { @@ -524,7 +524,7 @@ bool sd_has_inheritable_components(const SEC_DESC *parent_ctr, bool container) const SEC_ACL *the_acl = parent_ctr->dacl; for (i = 0; i < the_acl->num_aces; i++) { - const SEC_ACE *ace = &the_acl->aces[i]; + const struct security_ace *ace = &the_acl->aces[i]; if (is_inheritable_ace(ace, container)) { return true; @@ -546,7 +546,7 @@ NTSTATUS se_create_child_secdesc(TALLOC_CTX *ctx, bool container) { SEC_ACL *new_dacl = NULL, *the_acl = NULL; - SEC_ACE *new_ace_list = NULL; + struct security_ace *new_ace_list = NULL; unsigned int new_ace_list_ndx = 0, i; *ppsd = NULL; @@ -563,7 +563,7 @@ NTSTATUS se_create_child_secdesc(TALLOC_CTX *ctx, return NT_STATUS_NO_MEMORY; } - if (!(new_ace_list = TALLOC_ARRAY(ctx, SEC_ACE, + if (!(new_ace_list = TALLOC_ARRAY(ctx, struct security_ace, 2*the_acl->num_aces))) { return NT_STATUS_NO_MEMORY; } @@ -572,8 +572,8 @@ NTSTATUS se_create_child_secdesc(TALLOC_CTX *ctx, } for (i = 0; i < the_acl->num_aces; i++) { - const SEC_ACE *ace = &the_acl->aces[i]; - SEC_ACE *new_ace = &new_ace_list[new_ace_list_ndx]; + const struct security_ace *ace = &the_acl->aces[i]; + struct security_ace *new_ace = &new_ace_list[new_ace_list_ndx]; const DOM_SID *ptrustee = &ace->trustee; const DOM_SID *creator = NULL; uint8 new_flags = ace->flags; |