s3:dom_sid Global replace of DOM_SID with struct dom_sid

[idra/samba.git] / source3 / smbd / posix_acls.c

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 24da3cf99e6b9b786a7f4ce0007d9f362c44f0a7..d56a8e9db5f54e4fa8368ecaead4814a4ec5c2b5 100644 (file)
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -43,7 +43,7 @@ typedef struct canon_ace {
        struct canon_ace *next, *prev;
        SMB_ACL_TAG_T type;
        mode_t perms; /* Only use S_I(R|W|X)USR mode bits here. */
-       DOM_SID trustee;
+       struct dom_sid trustee;
        enum ace_owner owner_type;
        enum ace_attribute attr;
        posix_id unix_ug;
@@ -905,7 +905,7 @@ static int map_acl_perms_to_permset(connection_struct *conn, mode_t mode, SMB_AC
  Function to create owner and group SIDs from a SMB_STRUCT_STAT.
 ****************************************************************************/
 
-void create_file_sids(const SMB_STRUCT_STAT *psbuf, DOM_SID *powner_sid, DOM_SID *pgroup_sid)
+void create_file_sids(const SMB_STRUCT_STAT *psbuf, struct dom_sid *powner_sid, struct dom_sid *pgroup_sid)
 {
        uid_to_sid( powner_sid, psbuf->st_ex_uid );
        gid_to_sid( pgroup_sid, psbuf->st_ex_gid );
@@ -1164,15 +1164,16 @@ static mode_t map_nt_perms( uint32 *mask, int type)
 }
 
 /****************************************************************************
- Unpack a SEC_DESC into a UNIX owner and group.
+ Unpack a struct security_descriptor into a UNIX owner and group.
 ****************************************************************************/
 
 NTSTATUS unpack_nt_owners(struct connection_struct *conn,
                        uid_t *puser, gid_t *pgrp,
-                       uint32 security_info_sent, const SEC_DESC *psd)
+                       uint32 security_info_sent, const struct
+                       security_descriptor *psd)
 {
-       DOM_SID owner_sid;
-       DOM_SID grp_sid;
+       struct dom_sid owner_sid;
+       struct dom_sid grp_sid;
 
        *puser = (uid_t)-1;
        *pgrp = (gid_t)-1;
@@ -1347,8 +1348,8 @@ static bool uid_entry_in_group(connection_struct *conn, canon_ace *uid_ace, cano
 static bool ensure_canon_entry_valid(connection_struct *conn, canon_ace **pp_ace,
                                     const struct share_params *params,
                                     const bool is_directory,
-                                                       const DOM_SID *pfile_owner_sid,
-                                                       const DOM_SID *pfile_grp_sid,
+                                                       const struct dom_sid *pfile_owner_sid,
+                                                       const struct dom_sid *pfile_grp_sid,
                                                        const SMB_STRUCT_STAT *pst,
                                                        bool setting_acl)
 {
@@ -1489,7 +1490,7 @@ static bool ensure_canon_entry_valid(connection_struct *conn, canon_ace **pp_ace
  file owner or the owning group, and map these to SMB_ACL_USER_OBJ and SMB_ACL_GROUP_OBJ.
 ****************************************************************************/
 
-static void check_owning_objs(canon_ace *ace, DOM_SID *pfile_owner_sid, DOM_SID *pfile_grp_sid)
+static void check_owning_objs(canon_ace *ace, struct dom_sid *pfile_owner_sid, struct dom_sid *pfile_grp_sid)
 {
        bool got_user_obj, got_group_obj;
        canon_ace *current_ace;
@@ -1573,13 +1574,13 @@ static bool dup_owning_ace(canon_ace *dir_ace, canon_ace *ace)
 }
 
 /****************************************************************************
- Unpack a SEC_DESC into two canonical ace lists.
+ Unpack a struct security_descriptor into two canonical ace lists.
 ****************************************************************************/
 
 static bool create_canon_ace_lists(files_struct *fsp,
                                        const SMB_STRUCT_STAT *pst,
-                                       DOM_SID *pfile_owner_sid,
-                                       DOM_SID *pfile_grp_sid,
+                                       struct dom_sid *pfile_owner_sid,
+                                       struct dom_sid *pfile_grp_sid,
                                        canon_ace **ppfile_ace,
                                        canon_ace **ppdir_ace,
                                        const struct security_acl *dacl)
@@ -2307,18 +2308,18 @@ static mode_t create_default_mode(files_struct *fsp, bool interitable_mode)
 }
 
 /****************************************************************************
- Unpack a SEC_DESC into two canonical ace lists. We don't depend on this
+ Unpack a struct security_descriptor into two canonical ace lists. We don't depend on this
  succeeding.
 ****************************************************************************/
 
 static bool unpack_canon_ace(files_struct *fsp,
                                const SMB_STRUCT_STAT *pst,
-                               DOM_SID *pfile_owner_sid,
-                               DOM_SID *pfile_grp_sid,
+                               struct dom_sid *pfile_owner_sid,
+                               struct dom_sid *pfile_grp_sid,
                                canon_ace **ppfile_ace,
                                canon_ace **ppdir_ace,
                                uint32 security_info_sent,
-                               const SEC_DESC *psd)
+                               const struct security_descriptor *psd)
 {
        SMB_STRUCT_STAT st;
        canon_ace *file_ace = NULL;
@@ -2492,7 +2493,7 @@ static void arrange_posix_perms(const char *filename, canon_ace **pp_list_head)
 static canon_ace *canonicalise_acl(struct connection_struct *conn,
                                   const char *fname, SMB_ACL_T posix_acl,
                                   const SMB_STRUCT_STAT *psbuf,
-                                  const DOM_SID *powner, const DOM_SID *pgroup, struct pai_val *pal, SMB_ACL_TYPE_T the_acl_type)
+                                  const struct dom_sid *powner, const struct dom_sid *pgroup, struct pai_val *pal, SMB_ACL_TYPE_T the_acl_type)
 {
        mode_t acl_mask = (S_IRUSR|S_IWUSR|S_IXUSR);
        canon_ace *l_head = NULL;
@@ -2505,7 +2506,7 @@ static canon_ace *canonicalise_acl(struct connection_struct *conn,
        while ( posix_acl && (SMB_VFS_SYS_ACL_GET_ENTRY(conn, posix_acl, entry_id, &entry) == 1)) {
                SMB_ACL_TAG_T tagtype;
                SMB_ACL_PERMSET_T permset;
-               DOM_SID sid;
+               struct dom_sid sid;
                posix_id unix_ug;
                enum ace_owner owner_type;
 
@@ -3136,7 +3137,7 @@ static size_t merge_default_aces( struct security_ace *nt_ace_list, size_t num_a
  */
 
 static void add_or_replace_ace(struct security_ace *nt_ace_list, size_t *num_aces,
-                               const DOM_SID *sid, enum security_ace_type type,
+                               const struct dom_sid *sid, enum security_ace_type type,
                                uint32_t mask, uint8_t flags)
 {
        int i;
@@ -3174,10 +3175,10 @@ static NTSTATUS posix_get_nt_acl_common(struct connection_struct *conn,
                                      SMB_ACL_T posix_acl,
                                      SMB_ACL_T def_acl,
                                      uint32_t security_info,
-                                     SEC_DESC **ppdesc)
+                                     struct security_descriptor **ppdesc)
 {
-       DOM_SID owner_sid;
-       DOM_SID group_sid;
+       struct dom_sid owner_sid;
+       struct dom_sid group_sid;
        size_t sd_size = 0;
        struct security_acl *psa = NULL;
        size_t num_acls = 0;
@@ -3187,8 +3188,8 @@ static NTSTATUS posix_get_nt_acl_common(struct connection_struct *conn,
        canon_ace *dir_ace = NULL;
        struct security_ace *nt_ace_list = NULL;
        size_t num_profile_acls = 0;
-       DOM_SID orig_owner_sid;
-       SEC_DESC *psd = NULL;
+       struct dom_sid orig_owner_sid;
+       struct security_descriptor *psd = NULL;
        int i;
 
        /*
@@ -3437,7 +3438,7 @@ static NTSTATUS posix_get_nt_acl_common(struct connection_struct *conn,
 }
 
 NTSTATUS posix_fget_nt_acl(struct files_struct *fsp, uint32_t security_info,
-                          SEC_DESC **ppdesc)
+                          struct security_descriptor **ppdesc)
 {
        SMB_STRUCT_STAT sbuf;
        SMB_ACL_T posix_acl = NULL;
@@ -3470,7 +3471,7 @@ NTSTATUS posix_fget_nt_acl(struct files_struct *fsp, uint32_t security_info,
 }
 
 NTSTATUS posix_get_nt_acl(struct connection_struct *conn, const char *name,
-                         uint32_t security_info, SEC_DESC **ppdesc)
+                         uint32_t security_info, struct security_descriptor **ppdesc)
 {
        SMB_ACL_T posix_acl = NULL;
        SMB_ACL_T def_acl = NULL;
@@ -3627,11 +3628,11 @@ int try_chown(connection_struct *conn, struct smb_filename *smb_fname,
 ****************************************************************************/
 
 NTSTATUS append_parent_acl(files_struct *fsp,
-                               const SEC_DESC *pcsd,
-                               SEC_DESC **pp_new_sd)
+                               const struct security_descriptor *pcsd,
+                               struct security_descriptor **pp_new_sd)
 {
        struct smb_filename *smb_dname = NULL;
-       SEC_DESC *parent_sd = NULL;
+       struct security_descriptor *parent_sd = NULL;
        files_struct *parent_fsp = NULL;
        TALLOC_CTX *mem_ctx = talloc_tos();
        char *parent_name = NULL;
@@ -3640,7 +3641,7 @@ NTSTATUS append_parent_acl(files_struct *fsp,
        NTSTATUS status;
        int info;
        unsigned int i, j;
-       SEC_DESC *psd = dup_sec_desc(talloc_tos(), pcsd);
+       struct security_descriptor *psd = dup_sec_desc(talloc_tos(), pcsd);
        bool is_dacl_protected = (pcsd->type & SEC_DESC_DACL_PROTECTED);
 
        if (psd == NULL) {
@@ -3826,13 +3827,13 @@ NTSTATUS append_parent_acl(files_struct *fsp,
  This should be the only external function needed for the UNIX style set ACL.
 ****************************************************************************/
 
-NTSTATUS set_nt_acl(files_struct *fsp, uint32 security_info_sent, const SEC_DESC *psd)
+NTSTATUS set_nt_acl(files_struct *fsp, uint32 security_info_sent, const struct security_descriptor *psd)
 {
        connection_struct *conn = fsp->conn;
        uid_t user = (uid_t)-1;
        gid_t grp = (gid_t)-1;
-       DOM_SID file_owner_sid;
-       DOM_SID file_grp_sid;
+       struct dom_sid file_owner_sid;
+       struct dom_sid file_grp_sid;
        canon_ace *file_ace_list = NULL;
        canon_ace *dir_ace_list = NULL;
        bool acl_perms = False;
@@ -4701,9 +4702,9 @@ bool set_unix_posix_acl(connection_struct *conn, files_struct *fsp, const char *
  Assume we are dealing with files (for now)
 ********************************************************************/
 
-SEC_DESC *get_nt_acl_no_snum( TALLOC_CTX *ctx, const char *fname)
+struct security_descriptor *get_nt_acl_no_snum( TALLOC_CTX *ctx, const char *fname)
 {
-       SEC_DESC *psd, *ret_sd;
+       struct security_descriptor *psd, *ret_sd;
        connection_struct *conn;
        files_struct finfo;
        struct fd_handle fh;