s3:dom_sid Global replace of DOM_SID with struct dom_sid

[sfrench/samba-autobuild/.git] / source3 / modules / vfs_afsacl.c

diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c
index 1bf8366acccc108d21514547f7a7486b882b53ac..1f495d9448008ce66d9019e281c0737d34f96a20 100644 (file)
--- a/source3/modules/vfs_afsacl.c
+++ b/source3/modules/vfs_afsacl.c
@@ -30,11 +30,11 @@
 
 #define MAXSIZE 2048
 
-extern const DOM_SID global_sid_World;
-extern const DOM_SID global_sid_Builtin_Administrators;
-extern const DOM_SID global_sid_Builtin_Backup_Operators;
-extern const DOM_SID global_sid_Authenticated_Users;
-extern const DOM_SID global_sid_NULL;
+extern const struct dom_sid global_sid_World;
+extern const struct dom_sid global_sid_Builtin_Administrators;
+extern const struct dom_sid global_sid_Builtin_Backup_Operators;
+extern const struct dom_sid global_sid_Authenticated_Users;
+extern const struct dom_sid global_sid_NULL;
 
 static char space_replacement = '%';
 
@@ -46,7 +46,7 @@ extern int afs_syscall(int, char *, int, char *, int);
 struct afs_ace {
        bool positive;
        char *name;
-       DOM_SID sid;
+       struct dom_sid sid;
        enum lsa_SidType type;
        uint32 rights;
        struct afs_ace *next;
@@ -108,7 +108,7 @@ static struct afs_ace *new_afs_ace(TALLOC_CTX *mem_ctx,
                                   bool positive,
                                   const char *name, uint32 rights)
 {
-       DOM_SID sid;
+       struct dom_sid sid;
        enum lsa_SidType type;
        struct afs_ace *result;
 
@@ -591,8 +591,8 @@ static size_t afs_to_nt_acl_common(struct afs_acl *afs_acl,
                                   struct security_descriptor **ppdesc)
 {
        struct security_ace *nt_ace_list;
-       DOM_SID owner_sid, group_sid;
-       SEC_ACL *psa = NULL;
+       struct dom_sid owner_sid, group_sid;
+       struct security_acl *psa = NULL;
        int good_aces;
        size_t sd_size;
        TALLOC_CTX *mem_ctx = talloc_tos();
@@ -642,7 +642,7 @@ static size_t afs_to_nt_acl_common(struct afs_acl *afs_acl,
        if (psa == NULL)
                return 0;
 
-       *ppdesc = make_sec_desc(mem_ctx, SEC_DESC_REVISION,
+       *ppdesc = make_sec_desc(mem_ctx, SD_REVISION,
                                SEC_DESC_SELF_RELATIVE,
                                (security_info & OWNER_SECURITY_INFORMATION)
                                ? &owner_sid : NULL,
@@ -695,9 +695,9 @@ static size_t afs_fto_nt_acl(struct afs_acl *afs_acl,
        return afs_to_nt_acl_common(afs_acl, &sbuf, security_info, ppdesc);
 }
 
-static bool mappable_sid(const DOM_SID *sid)
+static bool mappable_sid(const struct dom_sid *sid)
 {
-       DOM_SID domain_sid;
+       struct dom_sid domain_sid;
        
        if (sid_compare(sid, &global_sid_Builtin_Administrators) == 0)
                return True;
@@ -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 */
@@ -1056,7 +1056,7 @@ static NTSTATUS afsacl_get_nt_acl(struct vfs_handle_struct *handle,
 NTSTATUS afsacl_fset_nt_acl(vfs_handle_struct *handle,
                         files_struct *fsp,
                         uint32 security_info_sent,
-                        const SEC_DESC *psd)
+                        const struct security_descriptor *psd)
 {
        return afs_set_nt_acl(handle, fsp, security_info_sent, psd);
 }