From: Roland McGrath <roland@gnu.org>
Date: Mon, 18 Jul 2005 02:50:15 +0000 (+0000)
Subject: 2005-04-27  Ulrich Drepper  <drepper@redhat.com>
X-Git-Tag: cvs/fedora-glibc-2_3-20050718T0425~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d122043d22b001cff2d2457bd03c82fdadf5de1d;p=thirdparty%2Fglibc.git

2005-04-27  Ulrich Drepper  <drepper@redhat.com>

	[BZ #1094]
	* nscd/connections.c (nscd_run): Use time() value in prune_cache
	call, not timeout value, since the latter might be from another clock.
---

diff --git a/nscd/connections.c b/nscd/connections.c
index 850ddfa67d5..b993bf1a320 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -1171,8 +1171,7 @@ handle_request: request received (Version = %d)"), req.version);
 	  /* The pthread_cond_timedwait() call timed out.  It is time
 		 to clean up the cache.  */
 	  assert (my_number < lastdb);
-	  prune_cache (&dbs[my_number],
-		       prune_ts.tv_sec + (prune_ts.tv_nsec >= 500000000));
+	  prune_cache (&dbs[my_number], time (NULL));
 
 	  if (clock_gettime (timeout_clock, &prune_ts) == -1)
 	    /* Should never happen.  */