From 07f54cb59270e2c3168ab2bb3e73e7a8d8563843 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 19 Oct 2001 23:56:21 +0000
Subject: Ensure we mask off deny modes correctly on being set (this shouldn't
 have caused problems but is tidier). Fix debug statement in locking.c Jeremy.
 (This used to be commit eac6bbd24ebf00b35e50953bc11186111dc39059)

---
 source3/include/smb.h     | 2 +-
 source3/locking/locking.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source3/include/smb.h b/source3/include/smb.h
index fba08aed43..c25b48dde2 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -107,7 +107,7 @@ implemented */
 #define GET_OPEN_MODE(x) ((x) & OPEN_MODE_MASK)
 #define SET_OPEN_MODE(x) ((x) & OPEN_MODE_MASK)
 #define GET_DENY_MODE(x) (((x)>>SHARE_MODE_SHIFT) & SHARE_MODE_MASK)
-#define SET_DENY_MODE(x) ((x)<<SHARE_MODE_SHIFT)
+#define SET_DENY_MODE(x) (((x) & SHARE_MODE_MASK) <<SHARE_MODE_SHIFT)
 
 /* Sync on open file (not sure if used anymore... ?) */
 #define FILE_SYNC_OPENMODE (1<<14)
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 70995da3e2..ca57bd6b8f 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -483,7 +483,7 @@ ssize_t del_share_entry( SMB_DEV_T dev, SMB_INO_T inode,
 	 * from the record.
 	 */
 
-	DEBUG(10,("del_share_mode: num_share_modes = %d\n", data->u.num_share_mode_entries ));
+	DEBUG(10,("del_share_entry: num_share_modes = %d\n", data->u.num_share_mode_entries ));
 
 	for (i=0;i<data->u.num_share_mode_entries;) {
 		if (share_modes_identical(&shares[i], entry)) {
@@ -494,7 +494,7 @@ ssize_t del_share_entry( SMB_DEV_T dev, SMB_INO_T inode,
 				dbuf.dsize - (sizeof(*data) + (i+1)*sizeof(*shares)));
 			del_count++;
 
-			DEBUG(10,("del_share_mode: deleting entry %d\n", i ));
+			DEBUG(10,("del_share_entry: deleting entry %d\n", i ));
 
 		} else {
 			i++;
-- 
cgit