summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2003-06-06 10:42:16 +0000
committerAndrew Tridgell <tridge@samba.org>2003-06-06 10:42:16 +0000
commit53f8d3f01aed0118bafa36c8eabfc558e29f91dd (patch)
treeaf33a7286657234cd3f4d6a35cf4fddcf0a0375c
parentadb710d028751530cb3f3a994d8f0085968e1baf (diff)
downloadsamba-53f8d3f01aed0118bafa36c8eabfc558e29f91dd.tar.gz
samba-53f8d3f01aed0118bafa36c8eabfc558e29f91dd.tar.bz2
samba-53f8d3f01aed0118bafa36c8eabfc558e29f91dd.zip
SMBlockingX timeouts are in units of 2 milliseconds, not 1
(This used to be commit 999cde3227210c90132ade3812e964087f04e541)
-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 7f0ffd7577..be51a32891 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -3941,7 +3941,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+999)/1000);
+ lock_timeout = ((lock_timeout == -1) ? -1 : (lock_timeout+499)/500);
/* Now do any requested locks */
data += ((large_file_format ? 20 : 10)*num_ulocks);