svn commit: samba r15269 - in branches/SAMBA_3_0/source/locking: .

jra at samba.org jra at samba.org
Wed Apr 26 11:02:47 GMT 2006


Author: jra
Date: 2006-04-26 11:02:46 +0000 (Wed, 26 Apr 2006)
New Revision: 15269

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

Log:
Fix incorrect boolean in assert to make POSIX lock tests
pass with CIFSFS.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/locking/brlock.c


Changeset:
Modified: branches/SAMBA_3_0/source/locking/brlock.c
===================================================================
--- branches/SAMBA_3_0/source/locking/brlock.c	2006-04-26 11:02:40 UTC (rev 15268)
+++ branches/SAMBA_3_0/source/locking/brlock.c	2006-04-26 11:02:46 UTC (rev 15269)
@@ -907,7 +907,7 @@
 			/* tmp_count == 3 - (we split a lock range in two). */
 			SMB_ASSERT(tmp_lock[0].lock_type == locks[i].lock_type);
 			SMB_ASSERT(tmp_lock[1].lock_type == UNLOCK_LOCK);
-			SMB_ASSERT(tmp_lock[2].lock_type != locks[i].lock_type);
+			SMB_ASSERT(tmp_lock[2].lock_type == locks[i].lock_type);
 
 			memcpy(&tp[count], &tmp_lock[0], sizeof(struct lock_struct));
 			count++;



More information about the samba-cvs mailing list