summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-04-04 20:46:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:28 -0500
commitd318fe4025755b68f88fd9f0605732ee8b94c57f (patch)
tree57ed59e1dad12604b448bdb7dde7d717b39480c7 /source3/smbd
parentdb69f6fae9f726ac6598a600b4e6e5e1a8ba96e9 (diff)
downloadsamba-d318fe4025755b68f88fd9f0605732ee8b94c57f.tar.gz
samba-d318fe4025755b68f88fd9f0605732ee8b94c57f.tar.bz2
samba-d318fe4025755b68f88fd9f0605732ee8b94c57f.zip
r6200: Returned access should contain share mode as well as open mode.
Jeremy. (This used to be commit 3aa784c07723430b429adc9abab9cc7c1325cb35)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/open.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index fbe763ab0a..5b349e2e44 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1435,7 +1435,7 @@ flags=0x%X flags2=0x%X mode=0%o returned %d\n",
DEBUG(10,("open_file_shared : share_mode = %x\n", fsp->share_mode ));
if (Access) {
- (*Access) = open_mode;
+ (*Access) = (SET_DENY_MODE(deny_mode) | SET_OPEN_MODE(open_mode));
}
action = 0;