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 875f18c3b3..122fa9294f 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -322,7 +322,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 & OWNER_SECURITY_INFORMATION) ? &sid_owner : NULL, + (security_info & SECINFO_OWNER) ? &sid_owner : NULL, (security_info & GROUP_SECURITY_INFORMATION) ? &sid_group : NULL, NULL, psa, &sd_size); if (*ppdesc==NULL) { @@ -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 | OWNER_SECURITY_INFORMATION)) == 0) + GROUP_SECURITY_INFORMATION | 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 3337dea255..65e58e1797 100644 --- a/source3/modules/onefs_acl.c +++ b/source3/modules/onefs_acl.c @@ -705,7 +705,7 @@ onefs_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp, sacl = NULL; /* Copy owner into ppdesc */ - if (security_info & OWNER_SECURITY_INFORMATION) { + if (security_info & SECINFO_OWNER) { if (!onefs_identity_to_sid(sd->owner, &owner_sid)) { status = NT_STATUS_INVALID_PARAMETER; goto out; @@ -840,7 +840,7 @@ NTSTATUS onefs_samba_sd_to_sd(uint32_t security_info_sent, *security_info_effective = security_info_sent; /* Setup owner */ - if (security_info_sent & OWNER_SECURITY_INFORMATION) { + if (security_info_sent & SECINFO_OWNER) { if (!onefs_og_to_identity(psd->owner_sid, &owner, false, snum)) return NT_STATUS_ACCESS_DENIED; diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c index a3f207738e..0e408d85af 100644 --- a/source3/modules/vfs_acl_common.c +++ b/source3/modules/vfs_acl_common.c @@ -36,7 +36,7 @@ static NTSTATUS store_acl_blob_fsp(vfs_handle_struct *handle, files_struct *fsp, DATA_BLOB *pblob); -#define HASH_SECURITY_INFO (OWNER_SECURITY_INFORMATION | \ +#define HASH_SECURITY_INFO (SECINFO_OWNER | \ GROUP_SECURITY_INFORMATION | \ DACL_SECURITY_INFORMATION | \ SACL_SECURITY_INFORMATION) @@ -371,7 +371,7 @@ static NTSTATUS get_nt_acl_internal(vfs_handle_struct *handle, } } - if (!(security_info & OWNER_SECURITY_INFORMATION)) { + if (!(security_info & SECINFO_OWNER)) { psd->owner_sid = NULL; } if (!(security_info & GROUP_SECURITY_INFORMATION)) { @@ -436,7 +436,7 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle, } return SMB_VFS_FSET_NT_ACL(fsp, - (OWNER_SECURITY_INFORMATION | + (SECINFO_OWNER | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION), psd); @@ -459,7 +459,7 @@ static NTSTATUS check_parent_acl_common(vfs_handle_struct *handle, status = get_nt_acl_internal(handle, NULL, parent_name, - (OWNER_SECURITY_INFORMATION | + (SECINFO_OWNER | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION), &parent_desc); @@ -532,7 +532,7 @@ static int open_acl_common(vfs_handle_struct *handle, status = get_nt_acl_internal(handle, NULL, fname, - (OWNER_SECURITY_INFORMATION | + (SECINFO_OWNER | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION), &pdesc); @@ -678,10 +678,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 & (OWNER_SECURITY_INFORMATION| + if ((security_info_sent & (SECINFO_OWNER| GROUP_SECURITY_INFORMATION| DACL_SECURITY_INFORMATION)) != - (OWNER_SECURITY_INFORMATION| + (SECINFO_OWNER| GROUP_SECURITY_INFORMATION| DACL_SECURITY_INFORMATION)) { /* No we don't - read from the existing SD. */ @@ -689,7 +689,7 @@ static NTSTATUS fset_nt_acl_common(vfs_handle_struct *handle, files_struct *fsp, status = get_nt_acl_internal(handle, fsp, NULL, - (OWNER_SECURITY_INFORMATION| + (SECINFO_OWNER| GROUP_SECURITY_INFORMATION| DACL_SECURITY_INFORMATION), &nc_psd); @@ -699,10 +699,10 @@ static NTSTATUS fset_nt_acl_common(vfs_handle_struct *handle, files_struct *fsp, } /* This is safe as nc_psd is discarded at fn exit. */ - if (security_info_sent & OWNER_SECURITY_INFORMATION) { + if (security_info_sent & SECINFO_OWNER) { nc_psd->owner_sid = psd->owner_sid; } - security_info_sent |= OWNER_SECURITY_INFORMATION; + security_info_sent |= SECINFO_OWNER; if (security_info_sent & GROUP_SECURITY_INFORMATION) { nc_psd->group_sid = psd->group_sid; diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c index 1f495d9448..7ea0eafd21 100644 --- a/source3/modules/vfs_afsacl.c +++ b/source3/modules/vfs_afsacl.c @@ -644,7 +644,7 @@ static size_t afs_to_nt_acl_common(struct afs_acl *afs_acl, *ppdesc = make_sec_desc(mem_ctx, SD_REVISION, SEC_DESC_SELF_RELATIVE, - (security_info & OWNER_SECURITY_INFORMATION) + (security_info & SECINFO_OWNER) ? &owner_sid : NULL, (security_info & GROUP_SECURITY_INFORMATION) ? &group_sid : NULL, |