diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-04-28 09:10:12 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2005-04-28 09:10:12 +0000 |
| commit | 7647ac797860753c61ec87cbf3057622714bf89d (patch) | |
| tree | 267195c1d8ddc0821cea0014999909d6944043e6 | |
| parent | 484a05dfdb542a31f146b27f7f8cd8ef51ea2d55 (diff) | |
| download | glibc-7647ac797860753c61ec87cbf3057622714bf89d.tar.gz glibc-7647ac797860753c61ec87cbf3057622714bf89d.tar.xz glibc-7647ac797860753c61ec87cbf3057622714bf89d.zip | |
Updated to fedora-glibc-20050428T0846
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | fedora/branch.mk | 4 | ||||
| -rw-r--r-- | nscd/connections.c | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 4d540f02f8..0e577b05a4 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 Jakub Jelinek <jakub@redhat.com> * elf/rtld.c (dl_main): Call _dl_init_linuxthreads_paths diff --git a/fedora/branch.mk b/fedora/branch.mk index 0136e04b4b..74c5403227 100644 --- a/fedora/branch.mk +++ b/fedora/branch.mk @@ -1,5 +1,5 @@ # This file is updated automatically by Makefile. glibc-branch := fedora glibc-base := HEAD -fedora-sync-date := 2005-04-27 19:12 UTC -fedora-sync-tag := fedora-glibc-20050427T1912 +fedora-sync-date := 2005-04-28 08:46 UTC +fedora-sync-tag := fedora-glibc-20050428T0846 diff --git a/nscd/connections.c b/nscd/connections.c index 1f61ee1044..818de977d5 100644 --- a/nscd/connections.c +++ b/nscd/connections.c @@ -1176,8 +1176,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. */ |