svn commit: samba r9332 - in branches/SAMBA_3_0_RELEASE: . source/lib

[jerry at samba.org]

Author: jerry
Date: 2005-08-16 21:19:19 +0000 (Tue, 16 Aug 2005)
New Revision: 9332

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9332

Log:
merge jeremy's smbstatus error message fix from 3.0 tree
Modified:
   branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
   branches/SAMBA_3_0_RELEASE/source/lib/util.c


Changeset:
Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
===================================================================
--- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt	2005-08-16 21:16:13 UTC (rev 9331)
+++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt	2005-08-16 21:19:19 UTC (rev 9332)
@@ -49,6 +49,7 @@
     * Merge new DOS error code from SAMBA_4.
     * Fix issue when non-English characters in filenames and 
       directories.
+    * Fix bogus error message in smbstatus about unknown share modes.
 
 
 o   Gerald (Jerry) Carter <jerry at samba.org>

Modified: branches/SAMBA_3_0_RELEASE/source/lib/util.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/lib/util.c	2005-08-16 21:16:13 UTC (rev 9331)
+++ branches/SAMBA_3_0_RELEASE/source/lib/util.c	2005-08-16 21:19:19 UTC (rev 9332)
@@ -2738,7 +2738,7 @@
 
 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 @@
 		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) {