Update.

2004-10-02  Ulrich Drepper  <drepper@redhat.com>

	* nscd/nscd_helper.c (get_mapping): No need to check timestamp if
	nscd_certainly_running is nonzero.

diff --git a/ChangeLog b/ChangeLog
index 1f7b8138636ef85bfcb5f41f2643bcd4f84fab95..8a25c96ceb80d900387634f02cf369d0b4f474ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-02  Ulrich Drepper  <drepper@redhat.com>
+
+       * nscd/nscd_helper.c (get_mapping): No need to check timestamp if
+       nscd_certainly_running is nonzero.
+
 2004-10-02  Simon Josefsson  <jas@extundo.com>
 
        [BZ #420]

diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c
index 3c8693a93da6de511dcc29b718cb86cfd88d34a3..0e16cb8aeb6b5b21fd04898c67a4c0706b641c2d 100644 (file)
--- a/nscd/nscd_helper.c
+++ b/nscd/nscd_helper.c
@@ -160,7 +160,8 @@ get_mapping (request_type type, const char *key,
   if (head.version != DB_VERSION || head.header_size != sizeof (head)
       /* This really should not happen but who knows, maybe the update
         thread got stuck.  */
-      || head.timestamp + MAPPING_TIMEOUT < time (NULL))
+      || (! head.nscd_certainly_running
+         && head.timestamp + MAPPING_TIMEOUT < time (NULL)))
     goto out_close;
 
   size_t size = (sizeof (head) + roundup (head.module * sizeof (ref_t), ALIGN)