summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-09-10 02:21:44 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:38:02 -0500
commit5fd875ae74b86d7ea532714d47aa74eb2f009ec9 (patch)
tree4be981e237eab8094222dc4c5cb9be6d4ecbee8c
parent0ac1490a89a29161d26ba7d2e404b39390469128 (diff)
downloadsamba-5fd875ae74b86d7ea532714d47aa74eb2f009ec9.tar.gz
samba-5fd875ae74b86d7ea532714d47aa74eb2f009ec9.tar.bz2
samba-5fd875ae74b86d7ea532714d47aa74eb2f009ec9.zip
r10138: Fix the mapping table (as tested in smbtorture). EXEC_ACCESS
should map to SEC_RIGHTS_FILE_READ, not READ|WRITE. Jeremy. (This used to be commit 26f63973e6207e3b5c3123f1326027ceac38966f)
-rw-r--r--source4/ntvfs/ntvfs_generic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c
index 024a48bf7a..8d2809cf6b 100644
--- a/source4/ntvfs/ntvfs_generic.c
+++ b/source4/ntvfs/ntvfs_generic.c
@@ -259,6 +259,7 @@ static NTSTATUS map_openx_open(uint16_t flags, uint16_t open_mode,
switch (open_mode & OPENX_MODE_ACCESS_MASK) {
case OPENX_MODE_ACCESS_READ:
+ case OPENX_MODE_ACCESS_EXEC:
io2->generic.in.access_mask = SEC_RIGHTS_FILE_READ;
break;
case OPENX_MODE_ACCESS_WRITE:
@@ -266,7 +267,6 @@ static NTSTATUS map_openx_open(uint16_t flags, uint16_t open_mode,
break;
case OPENX_MODE_ACCESS_RDWR:
case OPENX_MODE_ACCESS_FCB:
- case OPENX_MODE_ACCESS_EXEC:
io2->generic.in.access_mask =
SEC_RIGHTS_FILE_READ |
SEC_RIGHTS_FILE_WRITE;