svn commit: samba r7621 - in branches/SAMBA_4_0/source/ntvfs/common: .

[vlendec at samba.org]

Author: vlendec
Date: 2005-06-15 21:03:43 +0000 (Wed, 15 Jun 2005)
New Revision: 7621

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

Log:
Trivial reformatting while trying to understand share modes. Still survives
smbtorture *DENY* .

Volker

Modified:
   branches/SAMBA_4_0/source/ntvfs/common/opendb.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/common/opendb.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/common/opendb.c	2005-06-15 19:28:14 UTC (rev 7620)
+++ branches/SAMBA_4_0/source/ntvfs/common/opendb.c	2005-06-15 21:03:43 UTC (rev 7621)
@@ -156,8 +156,6 @@
 */
 static BOOL share_conflict(struct odb_entry *e1, struct odb_entry *e2)
 {
-#define CHECK_MASK(am, sa, right, share) if (((am) & (right)) && !((sa) & (share))) return True
-
 	if (e1->pending || e2->pending) return False;
 
 	/* if either open involves no read.write or delete access then
@@ -184,26 +182,23 @@
 		return False;
 	}
 
-	CHECK_MASK(e1->access_mask, e2->share_access, 
-		   SEC_FILE_WRITE_DATA | SEC_FILE_APPEND_DATA,
-		   NTCREATEX_SHARE_ACCESS_WRITE);
-	CHECK_MASK(e2->access_mask, e1->share_access, 
-		   SEC_FILE_WRITE_DATA | SEC_FILE_APPEND_DATA,
-		   NTCREATEX_SHARE_ACCESS_WRITE);
+#define CHECK_MASK(am, right, sa, share) \
+	if (((am) & (right)) && !((sa) & (share))) return True
+
+	CHECK_MASK(e1->access_mask, SEC_FILE_WRITE_DATA | SEC_FILE_APPEND_DATA,
+		   e2->share_access, NTCREATEX_SHARE_ACCESS_WRITE);
+	CHECK_MASK(e2->access_mask, SEC_FILE_WRITE_DATA | SEC_FILE_APPEND_DATA,
+		   e1->share_access, NTCREATEX_SHARE_ACCESS_WRITE);
 	
-	CHECK_MASK(e1->access_mask, e2->share_access, 
-		   SEC_FILE_READ_DATA | SEC_FILE_EXECUTE,
-		   NTCREATEX_SHARE_ACCESS_READ);
-	CHECK_MASK(e2->access_mask, e1->share_access, 
-		   SEC_FILE_READ_DATA | SEC_FILE_EXECUTE,
-		   NTCREATEX_SHARE_ACCESS_READ);
+	CHECK_MASK(e1->access_mask, SEC_FILE_READ_DATA | SEC_FILE_EXECUTE,
+		   e2->share_access, NTCREATEX_SHARE_ACCESS_READ);
+	CHECK_MASK(e2->access_mask, SEC_FILE_READ_DATA | SEC_FILE_EXECUTE,
+		   e1->share_access, NTCREATEX_SHARE_ACCESS_READ);
 
-	CHECK_MASK(e1->access_mask, e2->share_access, 
-		   SEC_STD_DELETE,
-		   NTCREATEX_SHARE_ACCESS_DELETE);
-	CHECK_MASK(e2->access_mask, e1->share_access, 
-		   SEC_STD_DELETE,
-		   NTCREATEX_SHARE_ACCESS_DELETE);
+	CHECK_MASK(e1->access_mask, SEC_STD_DELETE,
+		   e2->share_access, NTCREATEX_SHARE_ACCESS_DELETE);
+	CHECK_MASK(e2->access_mask, SEC_STD_DELETE,
+		   e1->share_access, NTCREATEX_SHARE_ACCESS_DELETE);
 
 	/* if a delete is pending then a second open is not allowed */
 	if ((e1->create_options & NTCREATEX_OPTIONS_DELETE_ON_CLOSE) ||