summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-07-26 01:53:23 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:38:22 -0500
commitf43522856bb4a6824447524c612a98fec1f991ef (patch)
tree24d0a2d7359cf85c45a7becb59219d91d20d9668
parent382b088193154f05c366db4d4ffd8942f963b619 (diff)
downloadsamba-f43522856bb4a6824447524c612a98fec1f991ef.tar.gz
samba-f43522856bb4a6824447524c612a98fec1f991ef.tar.bz2
samba-f43522856bb4a6824447524c612a98fec1f991ef.zip
r17247: When we map generic to specific we need to remember
to copy over the copy of the access_mask, open_access_mask. Jerry - this is a definate fix for a 3.0.23b and should also be on the patches page. CIFSFS breaks without this. Jeremy. (This used to be commit d11e71ebcccf6907f2404a04aa6bf61b12ab2709)
-rw-r--r--source3/smbd/open.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 74dd038381..95c70dff54 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1307,6 +1307,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
*/
se_map_generic(&access_mask, &file_generic_mapping);
+ open_access_mask = access_mask;
DEBUG(10, ("open_file_ntcreate: fname=%s, after mapping "
"access_mask=0x%x\n", fname, access_mask ));
@@ -1548,9 +1549,11 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
unx_mode = 0777;
}
- DEBUG(4,("calling open_file with flags=0x%X flags2=0x%X mode=0%o\n",
+ DEBUG(4,("calling open_file with flags=0x%X flags2=0x%X mode=0%o, "
+ "access_mask = 0x%x, open_access_mask = 0x%x\n",
(unsigned int)flags, (unsigned int)flags2,
- (unsigned int)unx_mode));
+ (unsigned int)unx_mode, (unsigned int)access_mask,
+ (unsigned int)open_access_mask));
/*
* open_file strips any O_TRUNC flags itself.