forked from rpms/glibc
ad85e10075
Upstream commit: commit 6484ae5b8c4d4314f748e4d3c9a9baa5385e57c5 - malloc: Fix -Wuse-after-free warning in tst-mallocalign1 [BZ #26779] - s_sincosf.h: Change pio4 type to float [BZ #28713] - math: Properly cast X_TLOSS to float [BZ #28713] - Regenerate ulps on x86_64 with GCC 12 - Avoid -Wuse-after-free in tests [BZ #26779]. - Fix build of nptl/tst-thread_local1.cc with GCC 12 - Fix stdio-common tests for GCC 12 -Waddress - Fix stdlib/tst-setcontext.c for GCC 12 -Warray-compare - resolv: Avoid GCC 12 false positive warning [BZ #28439]. - intl: Avoid -Wuse-after-free [BZ #26779] - elf: Drop elf/tls-macros.h in favor of __thread and tls_model attributes [BZ #28152] [BZ #28205] - time: Set daylight to 1 for matching DST/offset change (RHBZ#2155352) - elf/tst-tlsopt-powerpc fails when compiled with -mcpu=power10 (BZ# 29776) - time: Use 64 bit time on tzfile - nscd: Use 64 bit time_t on libc nscd routines (BZ# 29402) - nis: Build libnsl with 64 bit time_t - Use LFS and 64 bit time for installed programs (BZ #15333) Resolves: #2155352 Related: #2160734
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
commit 01c0a0405c5ea63d9b528e062b935d2ff6a6e2ed
|
|
Author: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org>
|
|
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 <dj@redhat.com>
|
|
|
|
(cherry picked from commit fa4a19277842fd09a4815a986f70e0fe0903836f)
|
|
|
|
diff --git a/nscd/nscd.h b/nscd/nscd.h
|
|
index b5da5be98a11d4de..1ce4c1f7fdb215f0 100644
|
|
--- a/nscd/nscd.h
|
|
+++ b/nscd/nscd.h
|
|
@@ -66,7 +66,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 81bf324256384de7..b6baa8abf881461c 100644
|
|
--- a/nscd/nscd_gethst_r.c
|
|
+++ b/nscd/nscd_gethst_r.c
|
|
@@ -113,7 +113,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)
|