AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-18 22:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

login: Use struct flock64 in utmp [BZ #24880]

Browse Source 
Commit 06ab719d30 ("Fix Linux fcntl OFD
locks for non-LFS architectures (BZ#20251)") introduced the use of
fcntl64 into the utmp implementation.  However, the lock file
structure was not updated to struct flock64 at that point.

(cherry picked from commit 0d5b291753)
This commit is contained in:
Florian Weimer 2019-08-15 16:09:20 +02:00
parent 8baeebad9a
commit dbbd748c5f
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2019-08-15 Florian Weimer <fweimer@redhat.com>
[BZ #24880]
* login/utmp_file.c (file_locking_failed): Use struct flock64.
(file_locking_unlock): Likewise.
2019-08-15 Florian Weimer <fweimer@redhat.com>
[BZ #24879]

1
NEWS
View File

@ -22,6 +22,7 @@ The following bugs are resolved with this release:
7408-2005
[24867] malloc: Remove unwanted leading whitespace in malloc_info
[24879] login: Disarm timer after utmp lock acquisition
[24880] login: Use struct flock64 in utmp
[24986] alpha: new getegid, geteuid and getppid syscalls used
unconditionally
[25189] Don't use a custom wrapper macro around __has_include

4
login/utmp_file.c
View File

@ -76,7 +76,7 @@ try_file_lock (int fd, int type)
alarm (TIMEOUT);
/* Try to get the lock. */
struct flock fl =
struct flock64 fl =
{
.l_type = type,
fl.l_whence = SEEK_SET,
@ -103,7 +103,7 @@ try_file_lock (int fd, int type)
static void
file_unlock (int fd)
{
struct flock fl =
struct flock64 fl =
{
.l_type = F_UNLCK,
};