From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id A217B385840A; Wed, 28 Dec 2022 20:27:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A217B385840A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1672259255; bh=6JTbAcfywwG5DReOaeJNlSdnyVoBzMzcS/idP4dvkwU=; h=From:To:Subject:Date:From; b=bprFNjViWp0iwSVVpJEKjambSM6PrwgMoKfFrGbY/lsYSuLS8XtyqEXu35VXHmfax 4ye3iAdhhbt7q6aQSXulyMEOl5Z0NhTH/JG3gT3TZkxxULkg2lKUNs97+EVzGhs0N0 G+02fVSOVSC0Ar2nwv31JGsVyDRZOVOY7CNPR0G0= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/release/2.35/master] nscd: Use 64 bit time_t on libc nscd routines (BZ# 29402) X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella Netto X-Git-Refname: refs/heads/release/2.35/master X-Git-Oldrev: f75f61b659ba738f3f7441b0cff832f9797630f4 X-Git-Newrev: 26c82788890b763482ed125346be71fd3e27a7eb Message-Id: <20221228202735.A217B385840A@sourceware.org> Date: Wed, 28 Dec 2022 20:27:35 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=26c82788890b763482ed125346be71fd3e27a7eb commit 26c82788890b763482ed125346be71fd3e27a7eb Author: Adhemerval Zanella Netto Date: Wed Oct 26 16:04:24 2022 -0300 nscd: Use 64 bit time_t on libc nscd routines (BZ# 29402) Although the nscd module is built with 64 bit time_t, the routines linked direct to libc.so need to use the internal symbols. Reviewed-by: DJ Delorie (cherry picked from commit fa4a19277842fd09a4815a986f70e0fe0903836f) Diff: --- NEWS | 1 + nscd/nscd.h | 2 +- nscd/nscd_gethst_r.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 70680f69c3..986578ab04 100644 --- a/NEWS +++ b/NEWS @@ -57,6 +57,7 @@ The following bugs are resolved with this release: [29225] network: Mistyped define statement in socket/sys/socket.h in line 184 [29305] Conserve NSS buffer space during DNS packet parsing + [29402] nscd: nscd: No such file or directory [29415] nscd: Fix netlink cache invalidation if epoll is used [29446] _dlopen now ignores dl_caller argument in static mode [29490] alpha: New __brk_call implementation is broken diff --git a/nscd/nscd.h b/nscd/nscd.h index 368091aef8..f15321585b 100644 --- a/nscd/nscd.h +++ b/nscd/nscd.h @@ -65,7 +65,7 @@ typedef enum struct traced_file { /* Tracks the last modified time of the traced file. */ - time_t mtime; + __time64_t mtime; /* Support multiple registered files per database. */ struct traced_file *next; int call_res_init; diff --git a/nscd/nscd_gethst_r.c b/nscd/nscd_gethst_r.c index 9becb62033..31c64275f0 100644 --- a/nscd/nscd_gethst_r.c +++ b/nscd/nscd_gethst_r.c @@ -112,7 +112,7 @@ __nscd_get_nl_timestamp (void) if (map == NULL || (map != NO_MAPPING && map->head->nscd_certainly_running == 0 - && map->head->timestamp + MAPPING_TIMEOUT < time_now ())) + && map->head->timestamp + MAPPING_TIMEOUT < time64_now ())) map = __nscd_get_mapping (GETFDHST, "hosts", &__hst_map_handle.mapped); if (map == NO_MAPPING)