Fixup correct timeout values for blocking lock timeouts (tested at connectathon

by Herb).
Jeremy.

diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index c4ff77bd8664a8fece6c5fb4cf24141e8d2711ff..ee474851267cd5c0386bfebe2e1c31db2bc7962c 100644 (file)
--- a/source/smbd/reply.c
+++ b/source/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);