diff options
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/nfs4_acls.c | 4 | ||||
| -rw-r--r-- | source3/modules/onefs_acl.c | 4 | ||||
| -rw-r--r-- | source3/modules/vfs_acl_common.c | 20 | ||||
| -rw-r--r-- | source3/modules/vfs_afsacl.c | 2 |
4 files changed, 15 insertions, 15 deletions
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index 122fa9294f..9f383cfc16 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -323,7 +323,7 @@ static NTSTATUS smb_get_nt_acl_nfs4_common(const SMB_STRUCT_STAT *sbuf, DEBUG(10,("after make sec_acl\n")); *ppdesc = make_sec_desc(mem_ctx, SD_REVISION, SEC_DESC_SELF_RELATIVE, (security_info & SECINFO_OWNER) ? &sid_owner : NULL, - (security_info & GROUP_SECURITY_INFORMATION) ? &sid_group : NULL, + (security_info & SECINFO_GROUP) ? &sid_group : NULL, NULL, psa, &sd_size); if (*ppdesc==NULL) { DEBUG(2,("make_sec_desc failed\n")); @@ -735,7 +735,7 @@ NTSTATUS smb_set_nt_acl_nfs4(files_struct *fsp, DEBUG(10, ("smb_set_nt_acl_nfs4 invoked for %s\n", fsp_str_dbg(fsp))); if ((security_info_sent & (DACL_SECURITY_INFORMATION | - GROUP_SECURITY_INFORMATION | SECINFO_OWNER)) == 0) + SECINFO_GROUP | SECINFO_OWNER)) == 0) { DEBUG(9, ("security_info_sent (0x%x) ignored\n", security_info_sent)); diff --git a/source3/modules/onefs_acl.c b/source3/modules/onefs_acl.c index 65e58e1797..51c6a233f9 100644 --- a/source3/modules/onefs_acl.c +++ b/source3/modules/onefs_acl.c @@ -715,7 +715,7 @@ onefs_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp, } /* Copy group into ppdesc */ - if (security_info & GROUP_SECURITY_INFORMATION) { + if (security_info & SECINFO_GROUP) { if (!onefs_identity_to_sid(sd->group, &group_sid)) { status = NT_STATUS_INVALID_PARAMETER; goto out; @@ -850,7 +850,7 @@ NTSTATUS onefs_samba_sd_to_sd(uint32_t security_info_sent, } /* Setup group */ - if (security_info_sent & GROUP_SECURITY_INFORMATION) { + if (security_info_sent & SECINFO_GROUP) { if (!onefs_og_to_identity(psd->group_sid, &group, true, snum)) return NT_STATUS_ACCESS_DENIED; diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c index 0e408d85af..08b4fbaf4d 100644 --- a/source3/modules/vfs_acl_common.c +++ b/source3/modules/vfs_acl_common.c @@ -37,7 +37,7 @@ static NTSTATUS store_acl_blob_fsp(vfs_handle_struct *handle, DATA_BLOB *pblob); #define HASH_SECURITY_INFO (SECINFO_OWNER | \ - GROUP_SECURITY_INFORMATION | \ + SECINFO_GROUP | \ DACL_SECURITY_INFORMATION | \ SACL_SECURITY_INFORMATION) @@ -374,7 +374,7 @@ static NTSTATUS get_nt_acl_internal(vfs_handle_struct *handle, if (!(security_info & SECINFO_OWNER)) { psd->owner_sid = NULL; } - if (!(security_info & GROUP_SECURITY_INFORMATION)) { + if (!(security_info & SECINFO_GROUP)) { psd->group_sid = NULL; } if (!(security_info & DACL_SECURITY_INFORMATION)) { @@ -437,7 +437,7 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle, return SMB_VFS_FSET_NT_ACL(fsp, (SECINFO_OWNER | - GROUP_SECURITY_INFORMATION | + SECINFO_GROUP | DACL_SECURITY_INFORMATION), psd); } @@ -460,7 +460,7 @@ static NTSTATUS check_parent_acl_common(vfs_handle_struct *handle, NULL, parent_name, (SECINFO_OWNER | - GROUP_SECURITY_INFORMATION | + SECINFO_GROUP | DACL_SECURITY_INFORMATION), &parent_desc); @@ -533,7 +533,7 @@ static int open_acl_common(vfs_handle_struct *handle, NULL, fname, (SECINFO_OWNER | - GROUP_SECURITY_INFORMATION | + SECINFO_GROUP | DACL_SECURITY_INFORMATION), &pdesc); if (NT_STATUS_IS_OK(status)) { @@ -679,10 +679,10 @@ static NTSTATUS fset_nt_acl_common(vfs_handle_struct *handle, files_struct *fsp, /* Ensure we have OWNER/GROUP/DACL set. */ if ((security_info_sent & (SECINFO_OWNER| - GROUP_SECURITY_INFORMATION| + SECINFO_GROUP| DACL_SECURITY_INFORMATION)) != (SECINFO_OWNER| - GROUP_SECURITY_INFORMATION| + SECINFO_GROUP| DACL_SECURITY_INFORMATION)) { /* No we don't - read from the existing SD. */ struct security_descriptor *nc_psd = NULL; @@ -690,7 +690,7 @@ static NTSTATUS fset_nt_acl_common(vfs_handle_struct *handle, files_struct *fsp, status = get_nt_acl_internal(handle, fsp, NULL, (SECINFO_OWNER| - GROUP_SECURITY_INFORMATION| + SECINFO_GROUP| DACL_SECURITY_INFORMATION), &nc_psd); @@ -704,10 +704,10 @@ static NTSTATUS fset_nt_acl_common(vfs_handle_struct *handle, files_struct *fsp, } security_info_sent |= SECINFO_OWNER; - if (security_info_sent & GROUP_SECURITY_INFORMATION) { + if (security_info_sent & SECINFO_GROUP) { nc_psd->group_sid = psd->group_sid; } - security_info_sent |= GROUP_SECURITY_INFORMATION; + security_info_sent |= SECINFO_GROUP; if (security_info_sent & DACL_SECURITY_INFORMATION) { nc_psd->dacl = dup_sec_acl(talloc_tos(), psd->dacl); diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c index 7ea0eafd21..f2ff474f06 100644 --- a/source3/modules/vfs_afsacl.c +++ b/source3/modules/vfs_afsacl.c @@ -646,7 +646,7 @@ static size_t afs_to_nt_acl_common(struct afs_acl *afs_acl, SEC_DESC_SELF_RELATIVE, (security_info & SECINFO_OWNER) ? &owner_sid : NULL, - (security_info & GROUP_SECURITY_INFORMATION) + (security_info & SECINFO_GROUP) ? &group_sid : NULL, NULL, psa, &sd_size); |