diff options
| author | Jeremy Allison <jra@samba.org> | 2004-02-24 00:02:58 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2004-02-24 00:02:58 +0000 |
| commit | 61eedb268bad8cf0e605f25a8362f1bd1705dfe7 (patch) | |
| tree | 7d7f1465d628275ab1ba0ba61fbdbc95c99fe488 /source3 | |
| parent | 397665a27375ee12d2b2c51370473cbe7d2ae2a4 (diff) | |
| download | samba-61eedb268bad8cf0e605f25a8362f1bd1705dfe7.tar.gz samba-61eedb268bad8cf0e605f25a8362f1bd1705dfe7.tar.bz2 samba-61eedb268bad8cf0e605f25a8362f1bd1705dfe7.zip | |
Fixup correct timeout values for blocking lock timeouts (tested at connectathon
by Herb).
Jeremy.
(This used to be commit 6356b792683100122500db9cf222b7e8518d834e)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/reply.c | 2 |
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); |