Author: metze Date: 2007-05-14 17:58:28 +0000 (Mon, 14 May 2007) New Revision: 22865
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22865 Log: handle pending locks in smb2 metze Modified: branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c Changeset: Modified: branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c =================================================================== --- branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c 2007-05-14 17:56:00 UTC (rev 22864) +++ branches/SAMBA_4_0/source/ntvfs/ntvfs_generic.c 2007-05-14 17:58:28 UTC (rev 22865) @@ -999,7 +999,11 @@ } 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;
