svn commit: samba r8086 - in trunk/source/smbd: .

jra at samba.org jra at samba.org
Sun Jul 3 00:05:55 GMT 2005


Author: jra
Date: 2005-07-03 00:05:52 +0000 (Sun, 03 Jul 2005)
New Revision: 8086

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

Log:
It's best to actually correctly check the return from "share_conflict()" :-).
Jeremy.

Modified:
   trunk/source/smbd/open.c


Changeset:
Modified: trunk/source/smbd/open.c
===================================================================
--- trunk/source/smbd/open.c	2005-07-02 19:17:29 UTC (rev 8085)
+++ trunk/source/smbd/open.c	2005-07-03 00:05:52 UTC (rev 8086)
@@ -367,6 +367,7 @@
 
 /****************************************************************************
  Check if we can open a file with a share mode.
+ Returns True if conflict, False if not.
 ****************************************************************************/
 
 static BOOL share_conflict(connection_struct *conn,
@@ -611,7 +612,7 @@
 			share_mode_entry *share_entry = &old_shares[i];
 
 			/* someone else has a share lock on it, check to see if we can too */
-			if (!share_conflict(conn, share_entry, access_mask,
+			if (share_conflict(conn, share_entry, access_mask,
 						share_access, create_options,
 						fname, p_flags)) {
 				SAFE_FREE(old_shares);



More information about the samba-cvs mailing list