From 1507c81f2a3a28129806bdeb98287766cf3bffb8 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 2 Oct 2004 19:31:11 +0000 Subject: [PATCH] Update. 2004-10-02 Ulrich Drepper * nscd/nscd_helper.c (get_mapping): No need to check timestamp if nscd_certainly_running is nonzero. --- ChangeLog | 5 +++++ nscd/nscd_helper.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1f7b813..8a25c96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-10-02 Ulrich Drepper + + * nscd/nscd_helper.c (get_mapping): No need to check timestamp if + nscd_certainly_running is nonzero. + 2004-10-02 Simon Josefsson [BZ #420] diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c index 3c8693a..0e16cb8 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) -- 2.7.4