From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 492E83836E7D; Wed, 1 Jun 2022 16:57:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 492E83836E7D 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.34/master] misc: Use 64 bit stat for getusershell (BZ# 29204) X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/release/2.34/master X-Git-Oldrev: b349fe072275bfc5763110a49fe6ef1b44d60289 X-Git-Newrev: aa8a87f51d7a1fb86ff75d3e3870316b6bc70dfe Message-Id: <20220601165723.492E83836E7D@sourceware.org> Date: Wed, 1 Jun 2022 16:57:23 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jun 2022 16:57:23 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=aa8a87f51d7a1fb86ff75d3e3870316b6bc70dfe commit aa8a87f51d7a1fb86ff75d3e3870316b6bc70dfe Author: Adhemerval Zanella Date: Tue May 31 11:51:46 2022 -0300 misc: Use 64 bit stat for getusershell (BZ# 29204) This is a missing spot initially from 52a5fe70a2c77935. Checked on i686-linux-gnu. (cherry picked from commit ec995fb2152f160f02bf695ff83c45df4a6cd868) Diff: --- NEWS | 1 + misc/getusershell.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 46e747a534..9fde64d55c 100644 --- a/NEWS +++ b/NEWS @@ -102,6 +102,7 @@ The following bugs are resolved with this release: [29097] time: fchmodat does not handle 64 bit time_t for AT_SYMLINK_NOFOLLOW [29203] libc: daemon is not y2038 aware + [29204] libc: getusershell is not 2038 aware Version 2.34 diff --git a/misc/getusershell.c b/misc/getusershell.c index 11f5aa83f8..4221095dca 100644 --- a/misc/getusershell.c +++ b/misc/getusershell.c @@ -97,7 +97,7 @@ initshells (void) { char **sp, *cp; FILE *fp; - struct stat64 statb; + struct __stat64_t64 statb; size_t flen; free(shells); @@ -106,7 +106,7 @@ initshells (void) strings = NULL; if ((fp = fopen(_PATH_SHELLS, "rce")) == NULL) goto init_okshells_noclose; - if (__fstat64(fileno(fp), &statb) == -1) { + if (__fstat64_time64(fileno(fp), &statb) == -1) { init_okshells: (void)fclose(fp); init_okshells_noclose: