From: Volker Lendecke <vl@samba.org>
Date: Tue, 16 Feb 2010 14:21:25 +0000 (+0100)
Subject: s3: Fix timeout calculation if g_lock_lock is given a timeout < 60s
X-Git-Url: http://git.samba.org/?p=abartlet%2Fsamba.git%2F.git;a=commitdiff_plain;h=f8b246e44c819b909b23b4b98ef0999c84d2f4ff

s3: Fix timeout calculation if g_lock_lock is given a timeout < 60s

Detected while showing this code to obnox :-)
---

diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c
index add670c154d..e4c6d7c660e 100644
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -338,7 +338,7 @@ NTSTATUS g_lock_lock(struct g_lock_ctx *ctx, const char *name,
 		fd_set *r_fds = NULL;
 		int max_fd = 0;
 		int ret;
-		struct timeval select_timeout;
+		struct timeval timeout_remaining, select_timeout;
 
 		status = g_lock_trylock(ctx, name, lock_type);
 		if (NT_STATUS_IS_OK(status)) {
@@ -395,8 +395,13 @@ NTSTATUS g_lock_lock(struct g_lock_ctx *ctx, const char *name,
 		}
 #endif
 
+		time_now = timeval_current();
+		timeout_remaining = timeval_until(&time_now, &timeout_end);
 		select_timeout = timeval_set(60, 0);
 
+		select_timeout = timeval_min(&select_timeout,
+					     &timeout_remaining);
+
 		ret = sys_select(max_fd + 1, r_fds, NULL, NULL,
 				 &select_timeout);
 		if (ret == -1) {