* 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/ChangeLog b/ChangeLog
index 548eac4efe4a9eb1b7a1a23640ffd04a94e47fad..afd6dc1a84e8538d2c2be8c16b2fbaa2096f6730 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-27  Ulrich Drepper  <drepper@redhat.com>
+
+       * nscd/connections.c (nscd_run): Use time() value in prune_cache
+       call, not timeout value, since the latter might be from another clock.
+
 2005-04-27  Roland McGrath  <roland@redhat.com>
 
        [BZ #877]

diff --git a/nscd/connections.c b/nscd/connections.c
index 86069b237a425fe3d7f9fef44558b412c240bd2a..706d657d498c37de7dfd7e38343fdbd4e4131d2f 100644 (file)
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -1174,8 +1174,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.  */