summaryrefslogtreecommitdiff
path: root/source3/lib/util.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-08-16 19:40:13 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:00:33 -0500
commit5cb0c45cba6a1696801595e02337edf58d7d5c05 (patch)
tree436030885c7718d12cb59d5a808ef5d7d376ff52 /source3/lib/util.c
parent3cc6c5cf9934dc3b7ca48a44dd6bf46f4bb4dfed (diff)
downloadsamba-5cb0c45cba6a1696801595e02337edf58d7d5c05.tar.gz
samba-5cb0c45cba6a1696801595e02337edf58d7d5c05.tar.bz2
samba-5cb0c45cba6a1696801595e02337edf58d7d5c05.zip
r9325: Remember to ignore FILE_SHARE_DELETE when mapping to old share
modes for display. Jeremy. (This used to be commit f00d41a9dcd03033c59a399090058c76b5ce14c1)
Diffstat (limited to 'source3/lib/util.c')
-rw-r--r--source3/lib/util.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c
index de366c604f..f66397104d 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -2738,7 +2738,7 @@ int _Insure_trap_error(int a1, int a2, int a3, int a4, int a5, int a6)
uint32 map_share_mode_to_deny_mode(uint32 share_access, uint32 private_options)
{
- switch (share_access) {
+ switch (share_access & ~FILE_SHARE_DELETE) {
case FILE_SHARE_NONE:
return DENY_ALL;
case FILE_SHARE_READ:
@@ -2746,7 +2746,6 @@ uint32 map_share_mode_to_deny_mode(uint32 share_access, uint32 private_options)
case FILE_SHARE_WRITE:
return DENY_READ;
case FILE_SHARE_READ|FILE_SHARE_WRITE:
- case FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE:
return DENY_NONE;
}
if (private_options & NTCREATEX_OPTIONS_PRIVATE_DENY_DOS) {