diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-05-14 17:58:28 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:52:25 -0500 |
| commit | 37f8c04d900df00dd984dfd6be33b367b145a3ac (patch) | |
| tree | 543dd55296d7b5fd4a4c884211af8ee213804bf8 /source4/ntvfs | |
| parent | 5eb7420f119df890e2e4b7acd904dc2da70793a6 (diff) | |
| download | samba-37f8c04d900df00dd984dfd6be33b367b145a3ac.tar.gz | |
r22865: handle pending locks in smb2
metze
(This used to be commit 8329fa689521b12e4ce2ac094b3e322fa4ed4bb8)
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/ntvfs_generic.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c index 05fb0df47bc..aa3009d86ec 100644 --- a/source4/ntvfs/ntvfs_generic.c +++ b/source4/ntvfs/ntvfs_generic.c @@ -999,7 +999,11 @@ _PUBLIC_ NTSTATUS ntvfs_map_lock(struct ntvfs_module_context *ntvfs, } else { lck2->generic.in.mode = LOCKING_ANDX_SHARED_LOCK; } - lck2->generic.in.timeout = 0; + if (lck->smb2.in.flags & SMB2_LOCK_FLAG_NO_PENDING) { + lck2->generic.in.timeout = 0; + } else { + lck2->generic.in.timeout = UINT32_MAX; + } if (lck->smb2.in.flags & SMB2_LOCK_FLAG_UNLOCK) { lck2->generic.in.ulock_cnt = 1; lck2->generic.in.lock_cnt = 0; |