From patchwork Wed Oct 26 19:04:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 59499 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1D3D63888801 for ; Wed, 26 Oct 2022 19:05:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1D3D63888801 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666811100; bh=fuwDpx+c3iZ2JTMWpUyqJkfVVNT7ulWGKuMxvxVi3X4=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=M06K8ajrAsKWqWIEM+GcpvhBgfARcG74sr3eSNiKXoBcKmpzalBC9wFoYCqbGF6Uk LdnLWpXBE6FJ9EoAAdGIbt0meF7tnh6ZWRq/YMRNS9yGvULKmBGZWpcZ/6hK3IPguQ Hsw/KcoV5a5cXVukGAAVEoShFyJ/DHd9ftonMYoM= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oo1-xc29.google.com (mail-oo1-xc29.google.com [IPv6:2607:f8b0:4864:20::c29]) by sourceware.org (Postfix) with ESMTPS id 90F353885524 for ; Wed, 26 Oct 2022 19:04:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 90F353885524 Received: by mail-oo1-xc29.google.com with SMTP id c13-20020a4ac30d000000b0047663e3e16bso2519784ooq.6 for ; Wed, 26 Oct 2022 12:04:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fuwDpx+c3iZ2JTMWpUyqJkfVVNT7ulWGKuMxvxVi3X4=; b=MN0yzUfn1zi4MiZG4bTlxQpS+HIk9lougLIu+jA2tiXweOB6X37c+Wj8j++EW9AuWO 623whEiKz0uvOIn0gpbkhPW2T5Qh2vntSl2+1YI1E1npoFGBsBMOhdbaRs6wl9e8L2bU 898T5gg33vXjndb3BRS1D76ls2MbqBqC7Em7mcIp1b89aaY9aDJBI16S3IbGkErDrHJs N/WT5cbn47YMuxW3zskXOMAj6USKY4U2iLOroEMwFb8CcfLOW4nmp/BCM3Ra632iuvOI c+IJUrONNq3UrnmpPjUVr/nKW5ZdbI8K7E+k3GvmUQDGRfYwEe747AXM9PpSSN/g6mBC y6hA== X-Gm-Message-State: ACrzQf0otCojZuyBY4q2pfpEv3e5R6n5S5G6eXJ7E5dUAsIlf38ML/JD XKFyisZulvzKki8zV1PzrGf42OK5wQ3ftEI/ X-Google-Smtp-Source: AMsMyM4e6jFWdFFHSNMIg/7LHlRfFyIH/WTAYe+mcl8L8U+h04prxBuj/3/5bsbCpBeCSgSCS+/FCQ== X-Received: by 2002:a4a:c684:0:b0:485:520f:c352 with SMTP id m4-20020a4ac684000000b00485520fc352mr8470391ooq.81.1666811073673; Wed, 26 Oct 2022 12:04:33 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c0:17c8:6a6b:43f7:824e:663]) by smtp.gmail.com with ESMTPSA id c17-20020aca1c11000000b00359af7ea8fdsm714937oic.34.2022.10.26.12.04.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Oct 2022 12:04:32 -0700 (PDT) To: libc-alpha@sourceware.org, Zev Weiss , Wayne Tung Subject: [PATCH 2/3] nscd: Use 64 bit time_t on libc nscd routines (BZ# 29402) Date: Wed, 26 Oct 2022 16:04:24 -0300 Message-Id: <20221026190425.2939456-3-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221026190425.2939456-1-adhemerval.zanella@linaro.org> References: <20221026190425.2939456-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, URIBL_BLACK autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 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 --- nscd/nscd.h | 2 +- nscd/nscd_gethst_r.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 31d13580a1..5958f181db 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)