s3-secdesc: remove "typedef struct security_acl SEC_ACL".

Guenther

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 66babb51f59ae8673af83a45952686ebea8cc4a2..ac989c1fc82b87ef5b73b284bc90e662026983db 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -524,7 +524,7 @@ char *get_sec_mask_str(TALLOC_CTX *ctx, uint32 type);
 void display_sec_access(uint32_t *info);
 void display_sec_ace_flags(uint8_t flags);
 void display_sec_ace(struct security_ace *ace);
-void display_sec_acl(SEC_ACL *sec_acl);
+void display_sec_acl(struct security_acl *sec_acl);
 void display_acl_type(uint16 type);
 void display_sec_desc(SEC_DESC *sec);
 
@@ -699,7 +699,7 @@ SEC_DESC *make_sec_desc(TALLOC_CTX *ctx,
                        enum security_descriptor_revision revision,
                        uint16 type,
                        const DOM_SID *owner_sid, const DOM_SID *grp_sid,
-                       SEC_ACL *sacl, SEC_ACL *dacl, size_t *sd_size);
+                       struct security_acl *sacl, struct security_acl *dacl, size_t *sd_size);
 SEC_DESC *dup_sec_desc(TALLOC_CTX *ctx, const SEC_DESC *src);
 NTSTATUS marshall_sec_desc(TALLOC_CTX *mem_ctx,
                           struct security_descriptor *secdesc,
@@ -712,7 +712,7 @@ NTSTATUS unmarshall_sec_desc(TALLOC_CTX *mem_ctx, uint8 *data, size_t len,
 NTSTATUS unmarshall_sec_desc_buf(TALLOC_CTX *mem_ctx, uint8_t *data, size_t len,
                                 struct sec_desc_buf **psecdesc_buf);
 SEC_DESC *make_standard_sec_desc(TALLOC_CTX *ctx, const DOM_SID *owner_sid, const DOM_SID *grp_sid,
-                                SEC_ACL *dacl, size_t *sd_size);
+                                struct security_acl *dacl, size_t *sd_size);
 struct sec_desc_buf *make_sec_desc_buf(TALLOC_CTX *ctx, size_t len, SEC_DESC *sec_desc);
 struct sec_desc_buf *dup_sec_desc_buf(TALLOC_CTX *ctx, struct sec_desc_buf *src);
 NTSTATUS sec_desc_add_sid(TALLOC_CTX *ctx, SEC_DESC **psd, DOM_SID *sid, uint32 mask, size_t *sd_size);

diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h
index 1936668a803fbba08a0a80b5dd8ccce36fa62528..0d0d14956c9a3ec65ff20c0625ea13da112618bb 100644 (file)
--- a/source3/include/rpc_secdes.h
+++ b/source3/include/rpc_secdes.h
@@ -67,12 +67,6 @@
                                        PROTECTED_SACL_SECURITY_INFORMATION|\
                                        PROTECTED_DACL_SECURITY_INFORMATION)
 
-#ifndef _SEC_ACL
-/* SEC_ACL */
-typedef struct security_acl SEC_ACL;
-#define _SEC_ACL
-#endif
-
 #ifndef SEC_DESC_REVISION
 #define SEC_DESC_REVISION 0x1
 #endif

diff --git a/source3/lib/secdesc.c b/source3/lib/secdesc.c
index a540aa684ce25de02187a3f962da825496b4ab72..a439b9e7c0829af92d493608f67d477753863f47 100644 (file)
--- a/source3/lib/secdesc.c
+++ b/source3/lib/secdesc.c
@@ -67,7 +67,7 @@ struct sec_desc_buf *sec_desc_merge_buf(TALLOC_CTX *ctx, struct sec_desc_buf *ne
 {
        DOM_SID *owner_sid, *group_sid;
        struct sec_desc_buf *return_sdb;
-       SEC_ACL *dacl, *sacl;
+       struct security_acl *dacl, *sacl;
        SEC_DESC *psd = NULL;
        uint16 secdesc_type;
        size_t secdesc_size;
@@ -111,7 +111,7 @@ struct sec_desc_buf *sec_desc_merge_buf(TALLOC_CTX *ctx, struct sec_desc_buf *ne
 SEC_DESC *sec_desc_merge(TALLOC_CTX *ctx, SEC_DESC *new_sdb, SEC_DESC *old_sdb)
 {
        DOM_SID *owner_sid, *group_sid;
-       SEC_ACL *dacl, *sacl;
+       struct security_acl *dacl, *sacl;
        SEC_DESC *psd = NULL;
        uint16 secdesc_type;
        size_t secdesc_size;
@@ -157,7 +157,7 @@ SEC_DESC *make_sec_desc(TALLOC_CTX *ctx,
                        enum security_descriptor_revision revision,
                        uint16 type,
                        const DOM_SID *owner_sid, const DOM_SID *grp_sid,
-                       SEC_ACL *sacl, SEC_ACL *dacl, size_t *sd_size)
+                       struct security_acl *sacl, struct security_acl *dacl, size_t *sd_size)
 {
        SEC_DESC *dst;
        uint32 offset     = 0;
@@ -365,7 +365,7 @@ NTSTATUS unmarshall_sec_desc_buf(TALLOC_CTX *mem_ctx, uint8_t *data, size_t len,
 ********************************************************************/
 
 SEC_DESC *make_standard_sec_desc(TALLOC_CTX *ctx, const DOM_SID *owner_sid, const DOM_SID *grp_sid,
-                                SEC_ACL *dacl, size_t *sd_size)
+                                struct security_acl *dacl, size_t *sd_size)
 {
        return make_sec_desc(ctx, SECURITY_DESCRIPTOR_REVISION_1,
                             SEC_DESC_SELF_RELATIVE, owner_sid, grp_sid, NULL,
@@ -412,7 +412,7 @@ struct sec_desc_buf *dup_sec_desc_buf(TALLOC_CTX *ctx, struct sec_desc_buf *src)
 NTSTATUS sec_desc_add_sid(TALLOC_CTX *ctx, SEC_DESC **psd, DOM_SID *sid, uint32 mask, size_t *sd_size)
 {
        SEC_DESC *sd   = 0;
-       SEC_ACL  *dacl = 0;
+       struct security_acl  *dacl = 0;
        struct security_ace  *ace  = 0;
        NTSTATUS  status;
 
@@ -464,7 +464,7 @@ NTSTATUS sec_desc_mod_sid(SEC_DESC *sd, DOM_SID *sid, uint32 mask)
 NTSTATUS sec_desc_del_sid(TALLOC_CTX *ctx, SEC_DESC **psd, DOM_SID *sid, size_t *sd_size)
 {
        SEC_DESC *sd   = 0;
-       SEC_ACL  *dacl = 0;
+       struct security_acl  *dacl = 0;
        struct security_ace  *ace  = 0;
        NTSTATUS  status;
 
@@ -521,7 +521,7 @@ static bool is_inheritable_ace(const struct security_ace *ace,
 bool sd_has_inheritable_components(const SEC_DESC *parent_ctr, bool container)
 {
        unsigned int i;
-       const SEC_ACL *the_acl = parent_ctr->dacl;
+       const struct security_acl *the_acl = parent_ctr->dacl;
 
        for (i = 0; i < the_acl->num_aces; i++) {
                const struct security_ace *ace = &the_acl->aces[i];
@@ -545,7 +545,7 @@ NTSTATUS se_create_child_secdesc(TALLOC_CTX *ctx,
                                        const DOM_SID *group_sid,
                                        bool container)
 {
-       SEC_ACL *new_dacl = NULL, *the_acl = NULL;
+       struct security_acl *new_dacl = NULL, *the_acl = NULL;
        struct security_ace *new_ace_list = NULL;
        unsigned int new_ace_list_ndx = 0, i;
 

diff --git a/source3/lib/sharesec.c b/source3/lib/sharesec.c
index 5aaadece3f07eb59c46f15e33e0ecccfa9ff2e8e..96ba5a3a2d7e88cf896b44ea2fd4f3a5ac1e9b60 100644 (file)
--- a/source3/lib/sharesec.c
+++ b/source3/lib/sharesec.c
@@ -229,7 +229,7 @@ SEC_DESC *get_share_security_default( TALLOC_CTX *ctx, size_t *psize, uint32 def
 {
        uint32_t sa;
        struct security_ace ace;
-       SEC_ACL *psa = NULL;
+       struct security_acl *psa = NULL;
        SEC_DESC *psd = NULL;
        uint32 spec_access = def_access;
 
@@ -436,7 +436,7 @@ bool parse_usershare_acl(TALLOC_CTX *ctx, const char *acl_str, SEC_DESC **ppsd)
        const char *pacl = acl_str;
        int num_aces = 0;
        struct security_ace *ace_list = NULL;
-       SEC_ACL *psa = NULL;
+       struct security_acl *psa = NULL;
        SEC_DESC *psd = NULL;
        size_t sd_size = 0;
        int i;

diff --git a/source3/libads/disp_sec.c b/source3/libads/disp_sec.c
index a7d15fa1e1936e5e20a641e094057816d8e4eca9..df1fc9206d974bd3ca69a56644f80104b9fc1405 100644 (file)
--- a/source3/libads/disp_sec.c
+++ b/source3/libads/disp_sec.c
@@ -173,7 +173,7 @@ static void ads_disp_ace(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, struct security_a
 }
 
 /* display ACL */
-static void ads_disp_acl(SEC_ACL *sec_acl, const char *type)
+static void ads_disp_acl(struct security_acl *sec_acl, const char *type)
 {
         if (!sec_acl)
                printf("------- (%s) ACL not present\n", type);

diff --git a/source3/libgpo/gpo_reg.c b/source3/libgpo/gpo_reg.c
index 885d7806d6f200fa8320dabcfa9d80d9993e66a6..b628748769cb0fcf4a109c30b9d5cdd2ca8acb25 100644 (file)
--- a/source3/libgpo/gpo_reg.c
+++ b/source3/libgpo/gpo_reg.c
@@ -694,7 +694,7 @@ static WERROR gp_reg_generate_sd(TALLOC_CTX *mem_ctx,
        struct security_ace ace[6];
        uint32_t mask;
 
-       SEC_ACL *theacl = NULL;
+       struct security_acl *theacl = NULL;
 
        uint8_t inherit_flags;
 

diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c
index fa01ca8cbbc7cccb81aa247d54ff697fe3993cfd..49a6a286af1df391eb370ef90499a1ecabb6bda8 100644 (file)
--- a/source3/libsmb/libsmb_xattr.c
+++ b/source3/libsmb/libsmb_xattr.c
@@ -141,7 +141,7 @@ ace_compare(struct security_ace *ace1,
 
 
 static void
-sort_acl(SEC_ACL *the_acl)
+sort_acl(struct security_acl *the_acl)
 {
        uint32 i;
        if (!the_acl) return;
@@ -386,13 +386,13 @@ done:
        return true;
 }
 
-/* add an struct security_ace to a list of struct security_aces in a SEC_ACL */
+/* add an struct security_ace to a list of struct security_aces in a struct security_acl */
 static bool
-add_ace(SEC_ACL **the_acl,
+add_ace(struct security_acl **the_acl,
         struct security_ace *ace,
         TALLOC_CTX *ctx)
 {
-       SEC_ACL *newacl;
+       struct security_acl *newacl;
        struct security_ace *aces;
 
        if (! *the_acl) {
@@ -428,7 +428,7 @@ sec_desc_parse(TALLOC_CTX *ctx,
        size_t sd_size;
        DOM_SID *group_sid=NULL;
         DOM_SID *owner_sid=NULL;
-       SEC_ACL *dacl=NULL;
+       struct security_acl *dacl=NULL;
        int revision=1;
 
        while (next_token_talloc(ctx, &p, &tok, "\t,\r\n")) {
@@ -1502,7 +1502,7 @@ cacl_set(SMBCCTX *context,
        uint16_t fnum = (uint16_t)-1;
         int err = 0;
        SEC_DESC *sd = NULL, *old;
-        SEC_ACL *dacl = NULL;
+        struct security_acl *dacl = NULL;
        DOM_SID *owner_sid = NULL;
        DOM_SID *group_sid = NULL;
        uint32 i, j;

diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 7696d5e6649234726e513df65fa5df1d9fe30e98..ebb6145945921def9e74d640af8861ae9e1d09e0 100644 (file)
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -296,7 +296,7 @@ static NTSTATUS smb_get_nt_acl_nfs4_common(const SMB_STRUCT_STAT *sbuf,
        DOM_SID sid_owner, sid_group;
        size_t sd_size = 0;
        struct security_ace *nt_ace_list = NULL;
-       SEC_ACL *psa = NULL;
+       struct security_acl *psa = NULL;
        TALLOC_CTX *mem_ctx = talloc_tos();
 
        if (theacl==NULL || smb_get_naces(theacl)==0)
@@ -675,7 +675,7 @@ static int smbacl4_MergeIgnoreReject(
 
 static SMB4ACL_T *smbacl4_win2nfs4(
        const char *filename,
-       const SEC_ACL *dacl,
+       const struct security_acl *dacl,
        smbacl4_vfs_params *pparams,
        uid_t ownerUID,
        gid_t ownerGID

diff --git a/source3/modules/onefs_acl.c b/source3/modules/onefs_acl.c
index 81ee81e787a3e316c583f82418a17979eee315bb..112ee43fcd404117db6e098af8663f6eca9e3dd1 100644 (file)
--- a/source3/modules/onefs_acl.c
+++ b/source3/modules/onefs_acl.c
@@ -232,10 +232,10 @@ onefs_samba_ace_to_ace(struct security_ace * samba_ace, struct ifs_ace * ace,
 }
 
 /**
- * Convert a SEC_ACL to a struct ifs_security_acl
+ * Convert a struct security_acl to a struct ifs_security_acl
  */
 static bool
-onefs_samba_acl_to_acl(SEC_ACL *samba_acl, struct ifs_security_acl **acl,
+onefs_samba_acl_to_acl(struct security_acl *samba_acl, struct ifs_security_acl **acl,
     bool * ignore_aces, int snum)
 {
        int num_aces = 0;
@@ -287,13 +287,13 @@ err_free:
 }
 
 /**
- * Convert a struct ifs_security_acl to a SEC_ACL
+ * Convert a struct ifs_security_acl to a struct security_acl
  */
 static bool
-onefs_acl_to_samba_acl(struct ifs_security_acl *acl, SEC_ACL **samba_acl)
+onefs_acl_to_samba_acl(struct ifs_security_acl *acl, struct security_acl **samba_acl)
 {
        struct security_ace *samba_aces = NULL;
-       SEC_ACL *tmp_samba_acl = NULL;
+       struct security_acl *tmp_samba_acl = NULL;
        int i, num_aces = 0;
 
        if (!samba_acl)
@@ -612,7 +612,7 @@ onefs_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
        struct ifs_security_descriptor *sd = NULL;
        DOM_SID owner_sid, group_sid;
        DOM_SID *ownerp, *groupp;
-       SEC_ACL *dacl, *sacl;
+       struct security_acl *dacl, *sacl;
        SEC_DESC *pdesc;
        bool alloced = false;
        bool new_aces_alloced = false;

diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c
index 1bf8366acccc108d21514547f7a7486b882b53ac..6e66bf2e01d8cd9a2644b617b88b023910440c4f 100644 (file)
--- a/source3/modules/vfs_afsacl.c
+++ b/source3/modules/vfs_afsacl.c
@@ -592,7 +592,7 @@ static size_t afs_to_nt_acl_common(struct afs_acl *afs_acl,
 {
        struct security_ace *nt_ace_list;
        DOM_SID owner_sid, group_sid;
-       SEC_ACL *psa = NULL;
+       struct security_acl *psa = NULL;
        int good_aces;
        size_t sd_size;
        TALLOC_CTX *mem_ctx = talloc_tos();
@@ -726,7 +726,7 @@ static bool nt_to_afs_acl(const char *filename,
                                                     const struct security_ace *ace),
                          struct afs_acl *afs_acl)
 {
-       const SEC_ACL *dacl;
+       const struct security_acl *dacl;
        int i;
 
        /* Currently we *only* look at the dacl */

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index f83e4b4da399ad2e80af8c287984ecd911e3850b..d15faaabd57f8937dcdf80e493db332b34489825 100644 (file)
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -2637,7 +2637,7 @@ WERROR spoolss_create_default_secdesc(TALLOC_CTX *mem_ctx,
        struct security_ace ace[5];     /* max number of ace entries */
        int i = 0;
        uint32_t sa;
-       SEC_ACL *psa = NULL;
+       struct security_acl *psa = NULL;
        SEC_DESC *psd = NULL;
        DOM_SID adm_sid;
        size_t sd_size;
@@ -5502,7 +5502,7 @@ WERROR nt_printing_setsec(const char *sharename, struct sec_desc_buf *secdesc_ct
 
        if (!secdesc_ctr->sd->owner_sid || !secdesc_ctr->sd->group_sid) {
                DOM_SID *owner_sid, *group_sid;
-               SEC_ACL *dacl, *sacl;
+               struct security_acl *dacl, *sacl;
                SEC_DESC *psd = NULL;
                size_t size;
 
@@ -5589,7 +5589,7 @@ static struct sec_desc_buf *construct_default_printer_sdb(TALLOC_CTX *ctx)
        struct security_ace ace[5];     /* max number of ace entries */
        int i = 0;
        uint32_t sa;
-       SEC_ACL *psa = NULL;
+       struct security_acl *psa = NULL;
        struct sec_desc_buf *sdb = NULL;
        SEC_DESC *psd = NULL;
        DOM_SID adm_sid;
@@ -5755,7 +5755,7 @@ bool nt_printing_getsec(TALLOC_CTX *ctx, const char *sharename, struct sec_desc_
        }
 
        if (DEBUGLEVEL >= 10) {
-               SEC_ACL *the_acl = (*secdesc_ctr)->sd->dacl;
+               struct security_acl *the_acl = (*secdesc_ctr)->sd->dacl;
                int i;
 
                DEBUG(10, ("secdesc_ctr for %s has %d aces:\n",

diff --git a/source3/registry/reg_dispatcher.c b/source3/registry/reg_dispatcher.c
index 8a516be8e2a881e3d0b2df91f38fc54f8f79163e..46a49403fbf64dd92a206a7580fe72a8b4f53102 100644 (file)
--- a/source3/registry/reg_dispatcher.c
+++ b/source3/registry/reg_dispatcher.c
@@ -40,7 +40,7 @@ static WERROR construct_registry_sd(TALLOC_CTX *ctx, SEC_DESC **psd)
        struct security_ace ace[3];
        size_t i = 0;
        SEC_DESC *sd;
-       SEC_ACL *theacl;
+       struct security_acl *theacl;
        size_t sd_size;
 
        /* basic access for Everyone */

diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index dd0fe1c4f8f0e81d8e8e8bc802f0e5aacec3e015..9477ec0ba28102da213036107fe6223c633d72a9 100644 (file)
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -320,7 +320,7 @@ static NTSTATUS make_lsa_object_sd(TALLOC_CTX *mem_ctx, SEC_DESC **sd, size_t *s
        struct security_ace ace[5];
        size_t i = 0;
 
-       SEC_ACL *psa = NULL;
+       struct security_acl *psa = NULL;
 
        /* READ|EXECUTE access for Everyone */
 

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 2620f2d3e599b590edd719ff57971f28837bda67..100a1762c78ac7e0ee7131505fec24f30d1d306b 100644 (file)
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -130,7 +130,7 @@ static NTSTATUS make_samr_object_sd( TALLOC_CTX *ctx, SEC_DESC **psd, size_t *sd
        struct security_ace ace[5];             /* at most 5 entries */
        size_t i = 0;
 
-       SEC_ACL *psa = NULL;
+       struct security_acl *psa = NULL;
 
        /* basic access for Everyone */
 
@@ -674,7 +674,7 @@ NTSTATUS _samr_SetSecurity(pipes_struct *p,
 {
        struct samr_user_info *uinfo;
        uint32 i;
-       SEC_ACL *dacl;
+       struct security_acl *dacl;
        bool ret;
        struct samu *sampass=NULL;
        NTSTATUS status;

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 50d40e1dce4170051e6cffcf3c84a2b358d7225c..749108f4165b47f408d90945307a071d0a1a25ac 100644 (file)
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -5443,7 +5443,7 @@ static WERROR update_printer_sec(struct policy_handle *handle,
        }
 
        if (DEBUGLEVEL >= 10) {
-               SEC_ACL *the_acl;
+               struct security_acl *the_acl;
                int i;
 
                the_acl = old_secdesc_ctr->sd->dacl;

diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c
index 2a5e95b2800b0d86f1bf284e501f843244bf242d..58dd03d90d02191a15a375ed945ac89c2fd6587e 100644 (file)
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -2387,7 +2387,7 @@ WERROR winreg_set_printer_secdesc(TALLOC_CTX *mem_ctx,
         */
        if (!secdesc->owner_sid || !secdesc->group_sid) {
                DOM_SID *owner_sid, *group_sid;
-               SEC_ACL *dacl, *sacl;
+               struct security_acl *dacl, *sacl;
                size_t size;
 
                result = winreg_get_printer_secdesc(tmp_ctx,

diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index 50c37c3ce03cee409c146f341b380b412201e337..904664f2235aee604516189d512512b695ef3030 100644 (file)
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -324,7 +324,7 @@ static void init_srv_share_info_2(pipes_struct *p, struct srvsvc_NetShareInfo2 *
 static void map_generic_share_sd_bits(SEC_DESC *psd)
 {
        int i;
-       SEC_ACL *ps_dacl = NULL;
+       struct security_acl *ps_dacl = NULL;
 
        if (!psd)
                return;

diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c
index d664306e4d26e4c968da7a47a40594eb2c778940..0975ef98c714904f693e90775e3c2d6066fc3e0e 100644 (file)
--- a/source3/rpc_server/srv_svcctl_nt.c
+++ b/source3/rpc_server/srv_svcctl_nt.c
@@ -140,7 +140,7 @@ static SEC_DESC* construct_scm_sd( TALLOC_CTX *ctx )
        struct security_ace ace[2];
        size_t i = 0;
        SEC_DESC *sd;
-       SEC_ACL *theacl;
+       struct security_acl *theacl;
        size_t sd_size;
 
        /* basic access for Everyone */

diff --git a/source3/services/services_db.c b/source3/services/services_db.c
index e501848ddd416df260ece6af824f07b04635f493..31a74d1a1899264758c23d1d3c15eed9bffca2d9 100644 (file)
--- a/source3/services/services_db.c
+++ b/source3/services/services_db.c
@@ -93,7 +93,7 @@ static SEC_DESC* construct_service_sd( TALLOC_CTX *ctx )
        struct security_ace ace[4];
        size_t i = 0;
        SEC_DESC *sd = NULL;
-       SEC_ACL *theacl = NULL;
+       struct security_acl *theacl = NULL;
        size_t sd_size;
 
        /* basic access for Everyone */

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 7d8dbc1f108507560226949d9b567da84b583e5a..24da3cf99e6b9b786a7f4ce0007d9f362c44f0a7 100644 (file)
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -1582,7 +1582,7 @@ static bool create_canon_ace_lists(files_struct *fsp,
                                        DOM_SID *pfile_grp_sid,
                                        canon_ace **ppfile_ace,
                                        canon_ace **ppdir_ace,
-                                       const SEC_ACL *dacl)
+                                       const struct security_acl *dacl)
 {
        bool all_aces_are_inherit_only = (fsp->is_directory ? True : False);
        canon_ace *file_ace = NULL;
@@ -3179,7 +3179,7 @@ static NTSTATUS posix_get_nt_acl_common(struct connection_struct *conn,
        DOM_SID owner_sid;
        DOM_SID group_sid;
        size_t sd_size = 0;
-       SEC_ACL *psa = NULL;
+       struct security_acl *psa = NULL;
        size_t num_acls = 0;
        size_t num_def_acls = 0;
        size_t num_aces = 0;

diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c
index 499f7bd7589c90fce7def66392e79671b7e1df2c..ff82fbd10a2f94d5e4efcd214b71e29533d5d6e2 100644 (file)
--- a/source3/utils/profiles.c
+++ b/source3/utils/profiles.c
@@ -58,7 +58,7 @@ static void verbose_output(const char *format, ...)
 
 static bool swap_sid_in_acl( SEC_DESC *sd, DOM_SID *s1, DOM_SID *s2 )
 {
-       SEC_ACL *theacl;
+       struct security_acl *theacl;
        int i;
        bool update = False;
 

diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index d4d381c95f51ac8c2940bfb4ac852d459b40fca6..da8dfa28b7400b8681e62cb1b4ba0ecc12c487d4 100644 (file)
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -298,7 +298,7 @@ static SEC_DESC* parse_acl_string(TALLOC_CTX *mem_ctx, const char *szACL, size_t
 {
        SEC_DESC *sd = NULL;
        struct security_ace *ace;
-       SEC_ACL *theacl;
+       struct security_acl *theacl;
        int num_ace;
        const char *pacl;
        int i;
@@ -335,10 +335,10 @@ static SEC_DESC* parse_acl_string(TALLOC_CTX *mem_ctx, const char *szACL, size_t
        return sd;
 }
 
-/* add an ACE to a list of ACEs in a SEC_ACL */
-static bool add_ace(TALLOC_CTX *mem_ctx, SEC_ACL **the_acl, struct security_ace *ace)
+/* add an ACE to a list of ACEs in a struct security_acl */
+static bool add_ace(TALLOC_CTX *mem_ctx, struct security_acl **the_acl, struct security_ace *ace)
 {
-       SEC_ACL *new_ace;
+       struct security_acl *new_ace;
        struct security_ace *aces;
        if (! *the_acl) {
                return (((*the_acl) = make_sec_acl(mem_ctx, 3, 1, ace)) != NULL);
@@ -384,7 +384,7 @@ static int ace_compare(struct security_ace *ace1, struct security_ace *ace2)
        return memcmp(ace1, ace2, sizeof(struct security_ace));
 }
 
-static void sort_acl(SEC_ACL *the_acl)
+static void sort_acl(struct security_acl *the_acl)
 {
        uint32 i;
        if (!the_acl) return;

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index a8e46123a4a042dcf256b746e4a9fbe28e5b29b8..f4307e3870509b10362152696516b03cb6712c6d 100644 (file)
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -529,10 +529,10 @@ static bool parse_ace(struct cli_state *cli, struct security_ace *ace,
        return True;
 }
 
-/* add an ACE to a list of ACEs in a SEC_ACL */
-static bool add_ace(SEC_ACL **the_acl, struct security_ace *ace)
+/* add an ACE to a list of ACEs in a struct security_acl */
+static bool add_ace(struct security_acl **the_acl, struct security_ace *ace)
 {
-       SEC_ACL *new_ace;
+       struct security_acl *new_ace;
        struct security_ace *aces;
        if (! *the_acl) {
                return (((*the_acl) = make_sec_acl(talloc_tos(), 3, 1, ace))
@@ -559,7 +559,7 @@ static SEC_DESC *sec_desc_parse(TALLOC_CTX *ctx, struct cli_state *cli, char *st
        SEC_DESC *ret = NULL;
        size_t sd_size;
        DOM_SID *grp_sid=NULL, *owner_sid=NULL;
-       SEC_ACL *dacl=NULL;
+       struct security_acl *dacl=NULL;
        int revision=1;
 
        while (next_token_talloc(ctx, &p, &tok, "\t,\r\n")) {
@@ -848,7 +848,7 @@ static int ace_compare(struct security_ace *ace1, struct security_ace *ace2)
        return memcmp(ace1, ace2, sizeof(struct security_ace));
 }
 
-static void sort_acl(SEC_ACL *the_acl)
+static void sort_acl(struct security_acl *the_acl)
 {
        uint32 i;
        if (!the_acl) return;
@@ -1049,7 +1049,7 @@ static int inherit(struct cli_state *cli, const char *filename,
                        /* remove all inherited ACL's. */
                        if (old->dacl) {
                                int i;
-                               SEC_ACL *temp=old->dacl;
+                               struct security_acl *temp=old->dacl;
                                old->dacl=make_sec_acl(talloc_tos(), 3, 0, NULL);
                                for (i=temp->num_aces-1;i>=0;i--) {
                                        struct security_ace *ace=&temp->aces[i];