svn commit: samba r15028 - in branches/SAMBA_3_0/source/libsmb: .

[jra]

Author: jra
Date: 2006-04-10 23:32:05 +0000 (Mon, 10 Apr 2006)
New Revision: 15028

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

Log:
Fix logic error checking valid args to POSIX lock
call.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/libsmb/clifile.c


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/clifile.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/clifile.c  2006-04-10 23:31:33 UTC (rev 
15027)
+++ branches/SAMBA_3_0/source/libsmb/clifile.c  2006-04-10 23:32:05 UTC (rev 
15028)
@@ -1148,7 +1148,7 @@
                        SMB_BIG_UINT offset, SMB_BIG_UINT len,
                        BOOL wait_lock, enum brl_type lock_type)
 {
-       if (lock_type != READ_LOCK || lock_type != WRITE_LOCK) {
+       if (lock_type != READ_LOCK && lock_type != WRITE_LOCK) {
                return False;
        }
        return cli_posix_lock_internal(cli, fnum, offset, len, wait_lock, 
lock_type);