summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-04-10 23:32:05 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:15:57 -0500
commit41a35cfe940ceba7b89eec776ca78eec8eeb4a82 (patch)
tree56bd974ab8405d6557f59a10ab8bb3c42de466e5
parent423352b90e5e3bb89db96ae43798db395ef818ee (diff)
downloadsamba-41a35cfe940ceba7b89eec776ca78eec8eeb4a82.tar.gz
samba-41a35cfe940ceba7b89eec776ca78eec8eeb4a82.tar.bz2
samba-41a35cfe940ceba7b89eec776ca78eec8eeb4a82.zip
r15028: Fix logic error checking valid args to POSIX lock
call. Jeremy. (This used to be commit 44b0d856ae867d1c407507dcf7940dd39f4f963a)
-rw-r--r--source3/libsmb/clifile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 80deb3a332..46ff8af6d5 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -1148,7 +1148,7 @@ BOOL cli_posix_lock(struct cli_state *cli, int fnum,
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);