s3: Fix timeout calculation if g_lock_lock is given a timeout < 60s
authorVolker Lendecke <vl@samba.org>
Tue, 16 Feb 2010 14:21:25 +0000 (15:21 +0100)
committerKarolin Seeger <kseeger@samba.org>
Thu, 1 Apr 2010 07:39:18 +0000 (09:39 +0200)
commite7aee6f328f07da3129b56f6491a8a6ab63fa6cf
tree64b3236db4b95d43916ffbe29437c8db635d52d2
parente46c217efea9ed0a67fbb0aa75303be12b5e19fa
s3: Fix timeout calculation if g_lock_lock is given a timeout < 60s

Detected while showing this code to obnox :-)
(cherry picked from commit f8b246e44c819b909b23b4b98ef0999c84d2f4ff)
(cherry picked from commit f73b306797f354d0a24ff8af40b05d6151e52a06)
source3/lib/g_lock.c