summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-04-28 06:27:13 +0000
committerUlrich Drepper <drepper@redhat.com>2005-04-28 06:27:13 +0000
commit75596b98a188edf513cd0ab306449198ea69f7bc (patch)
tree745e27a0184617da082033203a5221e4d522a445
parentad529081156700dcc9198f3688c4ab63ed09c110 (diff)
* nscd/connections.c (nscd_run): Use time() value in prune_cachecvs/fedora-glibc-20050428T0846
call, not timeout value, since the latter might be from another clock.
-rw-r--r--ChangeLog5
-rw-r--r--nscd/connections.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 548eac4efe..afd6dc1a84 100644
--- 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 86069b237a..706d657d49 100644
--- 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. */