From: Jakub Jelinek Date: Thu, 28 Apr 2005 09:10:12 +0000 (+0000) Subject: Updated to fedora-glibc-20050428T0846 X-Git-Tag: cvs/fedora-glibc-2_3_5-4~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7647ac797860753c61ec87cbf3057622714bf89d;p=thirdparty%2Fglibc.git Updated to fedora-glibc-20050428T0846 --- diff --git a/ChangeLog b/ChangeLog index 4d540f02f8f..0e577b05a4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-04-27 Ulrich Drepper + + * 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 * elf/rtld.c (dl_main): Call _dl_init_linuxthreads_paths diff --git a/fedora/branch.mk b/fedora/branch.mk index 0136e04b4ba..74c5403227e 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 1f61ee1044b..818de977d50 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. */