svn commit: samba r8063 - in trunk/source: lib utils

[jra at samba.org]

Author: jra
Date: 2005-07-01 20:56:27 +0000 (Fri, 01 Jul 2005)
New Revision: 8063

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

Log:
Ensure we map FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE correctly
to the old deny modes.
Jeremy.

Modified:
   trunk/source/lib/util.c
   trunk/source/utils/status.c


Changeset:
Modified: trunk/source/lib/util.c
===================================================================
--- trunk/source/lib/util.c	2005-07-01 19:23:50 UTC (rev 8062)
+++ trunk/source/lib/util.c	2005-07-01 20:56:27 UTC (rev 8063)
@@ -2746,6 +2746,7 @@
 		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 (create_options & NTCREATEX_OPTIONS_PRIVATE_DENY_DOS) {

Modified: trunk/source/utils/status.c
===================================================================
--- trunk/source/utils/status.c	2005-07-01 19:23:50 UTC (rev 8062)
+++ trunk/source/utils/status.c	2005-07-01 20:56:27 UTC (rev 8063)
@@ -119,6 +119,11 @@
 			case DENY_READ: d_printf("DENY_READ  "); break;
 			case DENY_WRITE:printf("DENY_WRITE "); break;
 			case DENY_FCB:  d_printf("DENY_FCB "); break;
+			default: {
+				d_printf("unknown-please report ! e->share_access = 0x%x, e->create_options = 0x%x\n",
+					(unsigned int)e->share_access, (unsigned int)e->create_options );
+				break;
+			}
 		}
 		d_printf("0x%-8x  ",(unsigned int)e->access_mask);
 		if (e->access_mask & (FILE_READ_DATA|FILE_WRITE_DATA)) {