sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

VFS: nfs4acl_xattr: Change nfs4acl_validate_blob() to use the fsp instead of the name.

Browse Source 
Changes use of SMB_VFS_REMOVEXATTR() -> SMB_VFS_FREMOVEXATTR().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Jeremy Allison 2021-04-01 13:33:35 -07:00 committed by Ralph Boehme
parent b094144abb
commit a2fd9df127
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source3/modules/vfs_nfs4acl_xattr.c
View File

@ -52,7 +52,7 @@ static const struct enum_list nfs4acl_encoding[] = {
* directories 0777. Discard the ACL blob if the mode is different. * directories 0777. Discard the ACL blob if the mode is different.
*/ */
static bool nfs4acl_validate_blob(vfs_handle_struct *handle, static bool nfs4acl_validate_blob(vfs_handle_struct *handle,
const struct smb_filename *smb_fname) files_struct *fsp)
{ {
struct nfs4acl_config *config = NULL; struct nfs4acl_config *config = NULL;
mode_t expected_mode; mode_t expected_mode;
@ -66,22 +66,17 @@ static bool nfs4acl_validate_blob(vfs_handle_struct *handle,
return true; return true;
} }
if (!VALID_STAT(smb_fname->st)) { if (S_ISDIR(fsp->fsp_name->st.st_ex_mode)) {
/* might be a create */
return true;
}
if (S_ISDIR(smb_fname->st.st_ex_mode)) {
expected_mode = 0777; expected_mode = 0777;
} else { } else {
expected_mode = 0666; expected_mode = 0666;
} }
if ((smb_fname->st.st_ex_mode & expected_mode) == expected_mode) { if ((fsp->fsp_name->st.st_ex_mode & expected_mode) == expected_mode) {
return true; return true;
} }
ret = SMB_VFS_NEXT_REMOVEXATTR(handle, ret = SMB_VFS_NEXT_FREMOVEXATTR(handle,
smb_fname, fsp,
config->xattr_name); config->xattr_name);
if (ret != 0 && errno != ENOATTR) { if (ret != 0 && errno != ENOATTR) {
DBG_ERR("Removing NFS4 xattr failed: %s\n", strerror(errno)); DBG_ERR("Removing NFS4 xattr failed: %s\n", strerror(errno));
@ -97,7 +92,6 @@ static NTSTATUS nfs4acl_get_blob(struct vfs_handle_struct *handle,
DATA_BLOB *blob) DATA_BLOB *blob)
{ {
struct nfs4acl_config *config = NULL; struct nfs4acl_config *config = NULL;
const struct smb_filename *smb_fname = fsp->fsp_name;
size_t allocsize = 256; size_t allocsize = 256;
ssize_t length; ssize_t length;
bool ok; bool ok;
@ -108,7 +102,7 @@ static NTSTATUS nfs4acl_get_blob(struct vfs_handle_struct *handle,
*blob = data_blob_null; *blob = data_blob_null;
ok = nfs4acl_validate_blob(handle, smb_fname); ok = nfs4acl_validate_blob(handle, fsp);
if (!ok) { if (!ok) {
return NT_STATUS_INTERNAL_ERROR; return NT_STATUS_INTERNAL_ERROR;
} }