From 61eedb268bad8cf0e605f25a8362f1bd1705dfe7 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 24 Feb 2004 00:02:58 +0000 Subject: Fixup correct timeout values for blocking lock timeouts (tested at connectathon by Herb). Jeremy. (This used to be commit 6356b792683100122500db9cf222b7e8518d834e) --- source3/smbd/reply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/smbd') 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); -- cgit