summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-10-21 06:36:14 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:02:22 -0500
commitd33ae23165f4a5c07d41c9049ece4de5c0bb62f4 (patch)
tree5ed6e61194a7ab4cd1159f5c4bab4b16c8037a38
parent4b95dd55164784f8f05e4f1cde16bfaac1e30468 (diff)
downloadsamba-d33ae23165f4a5c07d41c9049ece4de5c0bb62f4.tar.gz
samba-d33ae23165f4a5c07d41c9049ece4de5c0bb62f4.tar.bz2
samba-d33ae23165f4a5c07d41c9049ece4de5c0bb62f4.zip
r3107: slight tweak to the openx -> ntcreatex mapping routine. This mapping
can never be perfect, as openx can do things that ntcreatex can't, but with this tweak we get close (the BASE-DENY1 test passes completely, for example) (This used to be commit 88112b9677b3c9ca97d349905c95516c6f29c8a7)
-rw-r--r--source4/ntvfs/ntvfs_generic.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c
index 0be4e5fd8e..ceb7900935 100644
--- a/source4/ntvfs/ntvfs_generic.c
+++ b/source4/ntvfs/ntvfs_generic.c
@@ -96,7 +96,7 @@ NTSTATUS ntvfs_map_open(struct smbsrv_request *req, union smb_open *io,
break;
case OPENX_MODE_ACCESS_RDWR:
case OPENX_MODE_ACCESS_FCB:
- io2->generic.in.access_mask = GENERIC_RIGHTS_FILE_ALL_ACCESS;
+ io2->generic.in.access_mask = GENERIC_RIGHTS_FILE_READ | GENERIC_RIGHTS_FILE_WRITE;
break;
}
@@ -201,7 +201,6 @@ NTSTATUS ntvfs_map_open(struct smbsrv_request *req, union smb_open *io,
switch(io->open.in.flags & OPEN_FLAGS_DENY_MASK) {
case OPEN_FLAGS_DENY_DOS:
/* DENY_DOS is quite strange - it depends on the filename! */
- /* REWRITE: is this necessary for OPEN? */
if (is_exe_file(io->open.in.fname)) {
io2->generic.in.share_access = NTCREATEX_SHARE_ACCESS_READ | NTCREATEX_SHARE_ACCESS_WRITE;
} else {