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

Commit 06ab719d30b01da401150068054d3b8ea93dd12f ("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.

diff --git a/ChangeLog b/ChangeLog
index b8a9a18..b13346c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 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]
        login: Disarm timer after utmp lock acquisition.
        * login/utmp_file.c (struct file_locking): Remove.

diff --git a/login/utmp_file.c b/login/utmp_file.c
index f3c5283..94753e0 100644 (file)
--- a/login/utmp_file.c
+++ b/login/utmp_file.c
@@ -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,
     };