summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristof Schmitt <cs@samba.org>2017-08-23 10:33:42 -0700
committerRalph Boehme <slow@samba.org>2017-09-04 10:09:23 +0200
commit19004113f3c1a16dc7bfda60402623efd115265a (patch)
tree5244d74974120f1b17c549a21b334aeb2e6ab036
parentdccd9630fb6d82cbf79374c75cd305987c9c9eb8 (diff)
downloadsamba-19004113f3c1a16dc7bfda60402623efd115265a.tar.gz
vfs_gpfs: Do not map DELETE sharemode access to WRITE
A SMB client can deny the WRITE sharemode, but still grant the DELETE sharemode. Mapping the requested DELETE access to WRITE access breaks this case. Fix this by removing the incorrect mapping from DELETE access to WRITE access. Signed-off-by: Christof Schmitt <cs@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org>
-rw-r--r--source3/modules/vfs_gpfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index b2c92447f75..012b9331701 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -86,8 +86,8 @@ static bool set_gpfs_sharemode(files_struct *fsp, uint32_t access_mask,
return True;
}
- allow |= (access_mask & (FILE_WRITE_DATA|FILE_APPEND_DATA|
- DELETE_ACCESS)) ? GPFS_SHARE_WRITE : 0;
+ allow |= (access_mask & (FILE_WRITE_DATA|FILE_APPEND_DATA)) ?
+ GPFS_SHARE_WRITE : 0;
allow |= (access_mask & (FILE_READ_DATA|FILE_EXECUTE)) ?
GPFS_SHARE_READ : 0;