aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-10-02 19:31:11 +0000
committerUlrich Drepper <drepper@redhat.com>2004-10-02 19:31:11 +0000
commit1507c81f2a3a28129806bdeb98287766cf3bffb8 (patch)
treeed14ebdd3ea06450c1ee518d0cb552ba588b576b
parent29bdc37a646cecd2718f53ab7fe6fffe0c111a9d (diff)
downloadglibc-1507c81f2a3a28129806bdeb98287766cf3bffb8.tar
glibc-1507c81f2a3a28129806bdeb98287766cf3bffb8.tar.gz
glibc-1507c81f2a3a28129806bdeb98287766cf3bffb8.tar.bz2
glibc-1507c81f2a3a28129806bdeb98287766cf3bffb8.zip
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.
-rw-r--r--ChangeLog5
-rw-r--r--nscd/nscd_helper.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f7b813863..8a25c96ceb 100644
--- 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 3c8693a93d..0e16cb8aeb 100644
--- 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)