summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-02-24 00:03:18 +0000
committerJeremy Allison <jra@samba.org>2004-02-24 00:03:18 +0000
commit13dd3e60bdf9ea799a1c56ca7467f323922e636d (patch)
tree9269069bc7a460331335440b62e4dd26acfa8e7b /source3
parent06549b888621eb8ad05c25604e0c23c9930267b7 (diff)
downloadsamba-13dd3e60bdf9ea799a1c56ca7467f323922e636d.tar.gz
samba-13dd3e60bdf9ea799a1c56ca7467f323922e636d.tar.bz2
samba-13dd3e60bdf9ea799a1c56ca7467f323922e636d.zip
Fixup correct timeout values for blocking lock timeouts (tested at connectathon
by Herb). Jeremy. (This used to be commit b38b3a554221a234127c740e6432048e69b7f5a3)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/reply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index c4ff77bd86..ee47485126 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -4288,7 +4288,7 @@ no oplock granted on this file (%s).\n", fsp->fnum, fsp->fsp_name));
/* Setup the timeout in seconds. */
- lock_timeout = ((lock_timeout == -1) ? -1 : (lock_timeout+499)/500);
+ lock_timeout = ((lock_timeout == -1) ? -1 : (lock_timeout+999)/1000);
/* Now do any requested locks */
data += ((large_file_format ? 20 : 10)*num_ulocks);