r3107: slight tweak to the openx -> ntcreatex mapping routine. This mapping
authorAndrew Tridgell <tridge@samba.org>
Thu, 21 Oct 2004 06:36:14 +0000 (06:36 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 18:02:22 +0000 (13:02 -0500)
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)

source4/ntvfs/ntvfs_generic.c

index 0be4e5fd8e983247984f8aaeac0c83c1f263f08d..ceb7900935d573c95fc7660871cff285409e2e13 100644 (file)
@@ -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 {