5f265ff1c6
* Wed Jun 8 2022 Florian Weimer <fweimer@redhat.com> - 2.34-37 - Enable rseq by default and add GLIBC_2.35 rseq symbols (#2085529) * Wed Jun 8 2022 Florian Weimer <fweimer@redhat.com> - 2.34-36 - Sync with upstream branch release/2.34/master, commit 4c92a1041257c0155c6aa7a182fe5f78e477b0e6: - powerpc: Fix VSX register number on __strncpy_power9 [BZ #29197] - socket: Fix mistyped define statement in socket/sys/socket.h (BZ #29225) - iconv: Use 64 bit stat for gconv_parseconfdir (BZ# 29213) - catgets: Use 64 bit stat for __open_catalog (BZ# 29211) - inet: Use 64 bit stat for ruserpass (BZ# 29210) - socket: Use 64 bit stat for isfdtype (BZ# 29209) - posix: Use 64 bit stat for fpathconf (_PC_ASYNC_IO) (BZ# 29208) - posix: Use 64 bit stat for posix_fallocate fallback (BZ# 29207) - misc: Use 64 bit stat for getusershell (BZ# 29204) - misc: Use 64 bit stat for daemon (BZ# 29203) Resolves: #2085529 Resolves: #2091549 Related: #2091541
35 lines
987 B
Diff
35 lines
987 B
Diff
commit aa8a87f51d7a1fb86ff75d3e3870316b6bc70dfe
|
|
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
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 --git a/misc/getusershell.c b/misc/getusershell.c
|
|
index 11f5aa83f888a114..4221095dca743dfa 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:
|