svn commit: samba r16999 - in trunk/source/locking: .

[jra at samba.org]

Author: jra
Date: 2006-07-12 21:57:52 +0000 (Wed, 12 Jul 2006)
New Revision: 16999

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

Log:
Allow CIFS POSIX locks to coexist with Windows locks.
We shouldn't allow this on the same smbd, but the cifsfs
client negotiates POSIX locks then sends Windows ones.
Doh ! Can't fix shipped client code....
Jeremy.

Modified:
   trunk/source/locking/posix.c


Changeset:
Modified: trunk/source/locking/posix.c
===================================================================
--- trunk/source/locking/posix.c	2006-07-12 21:05:11 UTC (rev 16998)
+++ trunk/source/locking/posix.c	2006-07-12 21:57:52 UTC (rev 16999)
@@ -642,7 +642,7 @@
 	int *fd_array = NULL;
 	size_t count, i;
 
-	if (!lp_locking(SNUM(fsp->conn)) || !lp_posix_locking(SNUM(conn)) || lp_posix_cifsu_locktype()) {
+	if (!lp_locking(SNUM(fsp->conn)) || !lp_posix_locking(SNUM(conn))) {
 		/*
 		 * No locking or POSIX to worry about or we want POSIX semantics
 		 * which will lose all locks on all fd's open on this dev/inode,