agetty: remove obsolete HAVE_UPDWTMP fallback

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

diff --git a/configure.ac b/configure.ac
index 73c1b29e4ded9442a6672064158c401a8dda0d6e..5917126ecf1ed17eba53717a68aaec6fbfffa937 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -412,7 +412,6 @@ AC_CHECK_FUNCS([ \
        strnlen \
        sysconf \
        sysinfo \
-       updwtmp \
        usleep \
        warn \
        warnx \

diff --git a/include/pathnames.h b/include/pathnames.h
index 05fb082ea28c9b4efb9059f84c36b2da654e287d..a5e8507e01469c7d96b41da5160609fcf4612aba 100644 (file)
--- a/include/pathnames.h
+++ b/include/pathnames.h
@@ -35,8 +35,6 @@
 # define _PATH_DEFPATH_ROOT    "/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
 #endif
 
-#define _PATH_WTMPLOCK         "/etc/wtmplock"
-
 #define        _PATH_HUSHLOGIN         ".hushlogin"
 #define        _PATH_HUSHLOGINS        "/etc/hushlogins"
 

diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index dbf499ef576c02f9516a07e042769dbb4702f8ed..0f114a532166b1bcf0d8adb26a7b499627c906c7 100644 (file)
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -28,7 +28,6 @@
 #include <utmp.h>
 #include <getopt.h>
 #include <time.h>
-#include <sys/file.h>
 #include <sys/socket.h>
 #include <langinfo.h>
 #include <grp.h>
@@ -951,25 +950,7 @@ static void update_utmp(struct options *op)
        pututline(&ut);
        endutent();
 
-       {
-#ifdef HAVE_UPDWTMP
-               updwtmp(_PATH_WTMP, &ut);
-#else
-               int ut_fd;
-               int lf;
-
-               if ((lf = open(_PATH_WTMPLOCK, O_CREAT | O_WRONLY, 0660)) >= 0) {
-                       flock(lf, LOCK_EX);
-                       if ((ut_fd =
-                            open(_PATH_WTMP, O_APPEND | O_WRONLY)) >= 0) {
-                               write_all(ut_fd, &ut, sizeof(ut));
-                               close(ut_fd);
-                       }
-                       flock(lf, LOCK_UN);
-                       close(lf);
-               }
-#endif                         /* HAVE_UPDWTMP */
-       }
+       updwtmp(_PATH_WTMP, &ut);
 }
 
 #endif                         /* SYSV_STYLE */

diff --git a/tests/expected/paths/built-in b/tests/expected/paths/built-in
index 197f67fe25161af04382e767177e2ad73695dff3..7274afa18fe70f8d2161b78d9aee680d06bd2374 100644 (file)
--- a/tests/expected/paths/built-in
+++ b/tests/expected/paths/built-in
@@ -1,7 +1,6 @@
        _PATH_DEFPATH /usr/local/bin:/bin:/usr/bin
   _PATH_DEFPATH_ROOT /usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
       _PATH_DEV_LOOP /dev/loop
-      _PATH_WTMPLOCK /etc/wtmplock
      _PATH_HUSHLOGIN .hushlogin
        _PATH_MAILDIR /var/mail
       _PATH_MOTDFILE /etc/motd

diff --git a/tests/helpers/test_pathnames.c b/tests/helpers/test_pathnames.c
index 2c9ec550118df1eb17aa5e2c90d79909a4f19390..d5cdad829b40789284d98f40afdfbdc41e7e8b79 100644 (file)
--- a/tests/helpers/test_pathnames.c
+++ b/tests/helpers/test_pathnames.c
@@ -34,7 +34,6 @@ struct hlpPath paths[] =
        DEF_HLPPATH(_PATH_DEFPATH),
        DEF_HLPPATH(_PATH_DEFPATH_ROOT),
        DEF_HLPPATH(_PATH_DEV_LOOP),
-       DEF_HLPPATH(_PATH_WTMPLOCK),
        DEF_HLPPATH(_PATH_HUSHLOGIN),
        DEF_HLPPATH(_PATH_MAILDIR),
        DEF_HLPPATH(_PATH_MOTDFILE),