From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 27 May 2008 04:59:55 +0000 (+1000)
Subject: make the SEC_STD_SYNCHRONIZE test more specific
X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=commitdiff_plain;h=65e31a965ee6514610ec0d4ca52a5cd8772c5254

make the SEC_STD_SYNCHRONIZE test more specific
(This used to be commit 8c263f91bda97eb910c8589b6cd987ec4a62d770)
---

diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c
index 739c127b985..cfa88b6baad 100644
--- a/source4/ntvfs/posix/pvfs_open.c
+++ b/source4/ntvfs/posix/pvfs_open.c
@@ -1155,13 +1155,16 @@ NTSTATUS pvfs_open(struct ntvfs_module_context *ntvfs,
 		return NT_STATUS_ACCESS_DENIED;
 	}
 
+	/* what does this bit really mean?? */
 	if (req->ctx->protocol == PROTOCOL_SMB2 &&
-	    (access_mask & SEC_STD_SYNCHRONIZE)) {
+	    (access_mask & SEC_STD_SYNCHRONIZE) &&
+	    !(access_mask & SEC_STD_READ_CONTROL)) {
 		return NT_STATUS_ACCESS_DENIED;
 	}
 
 	if (io->ntcreatex.in.file_attr & (FILE_ATTRIBUTE_DEVICE|
-					  FILE_ATTRIBUTE_VOLUME)) {
+					  FILE_ATTRIBUTE_VOLUME| 
+					  (~FILE_ATTRIBUTE_ALL_MASK))) {
 		return NT_STATUS_INVALID_PARAMETER;
 	}