summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-11-27 19:09:10 +1100
committerAndrew Tridgell <tridge@samba.org>2009-11-27 19:42:10 +1100
commitb3115f5cdc558ed71e11141e4f515511f3c6df5a (patch)
treeae6c2dc147f6c5bf9994ee1fbcbb74f8dadf636d
parentaf087f98ab87be858c97e273f31c5dae6d49ef02 (diff)
downloadsamba-b3115f5cdc558ed71e11141e4f515511f3c6df5a.tar.gz
samba-b3115f5cdc558ed71e11141e4f515511f3c6df5a.tar.bz2
samba-b3115f5cdc558ed71e11141e4f515511f3c6df5a.zip
s4-ntvfs: win7 does not check for the NONE smb2 lock flag on unlock
-rw-r--r--source4/ntvfs/ntvfs_generic.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c
index 3319539b63..059145b6e5 100644
--- a/source4/ntvfs/ntvfs_generic.c
+++ b/source4/ntvfs/ntvfs_generic.c
@@ -1116,7 +1116,8 @@ NTSTATUS ntvfs_map_lock(struct ntvfs_module_context *ntvfs,
isunlock = false;
}
for (i=0;i<lck->smb2.in.lock_count;i++) {
- if (lck->smb2.in.locks[i].flags == SMB2_LOCK_FLAG_NONE) {
+ if (!isunlock &&
+ lck->smb2.in.locks[i].flags == SMB2_LOCK_FLAG_NONE) {
return NT_STATUS_INVALID_PARAMETER;
}