mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-27 03:41:23 +08: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.
This commit is contained in:
Florian Weimer 2019-08-15 16:09:20 +02:00
parent 628598be7e
commit 0d5b291753
2 changed files with 8 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> 2019-08-15 Florian Weimer <fweimer@redhat.com>
[BZ #24879] [BZ #24879]

4
login/utmp_file.c
View File

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