[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  8bfbdf5 Ensure we don't return an incorrect access mask.
      from  2e19148 Implement the SMB2 close flag SMB2_CLOSE_FLAGS_FULL_INFORMATION (and move definition to correct place).

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 8bfbdf54153246689783f90472128f1b4666e86f
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Feb 24 16:04:09 2011 -0800

    Ensure we don't return an incorrect access mask.
    
    From the Microsoft test suite @ Connectathon:
    
    Test Case: TestSuite_ScenarioNo009GrantedAccessTestS0
        File created with access = 0x7 (Read, Write, Delete)
        Query Info on file returns 0x87 (Read, Write, Delete, Read Attributes)
    
    Jeremy.
    (cherry picked from commit 1f2433c719b3a64353a730b963a9b0ff7a8357cb)

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/open.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 2ebcb50..14d15e7 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2261,8 +2261,9 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
 
 	/*
 	 * According to Samba4, SEC_FILE_READ_ATTRIBUTE is always granted,
+	 * but we don't have to store this - just ignore it on access check.
 	 */
-	fsp->access_mask = access_mask | FILE_READ_ATTRIBUTES;
+	fsp->access_mask = access_mask;
 
 	if (file_existed) {
 		/* stat opens on existing files don't get oplocks. */


-- 
Samba Shared Repository