Updated to fedora-glibc-20050428T0846

diff --git a/ChangeLog b/ChangeLog
index 4d540f02f8fa110861663731d92014209debb979..0e577b05a4c78ac353b0b36106988b97be76f14c 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  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 0136e04b4ba4db870d25108b928e24cab0c53372..74c5403227e873c724d3cea2517ab27267ecfdf3 100644 (file)
--- 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 1f61ee1044bd1e0875485bb47342f4e1e42941a0..818de977d50deb41d45d2f23e3eddb2059cf5021 100644 (file)
--- 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.  */