summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-05-31 13:57:18 +1000
committerDamien Miller <djm@mindrot.org>2000-05-31 13:57:18 +1000
commit1c77392bce06d3f354fe1a3efa4e336c68933807 (patch)
tree8dc7ee3a8a0ea73552c1b752528111b45fbef4cd
parent1ea8ac7b90c2002ee6041fb90e1f94c7f8a94608 (diff)
- Rewrote bsd-login to use proper utmp API if available. Major cleanupPRE_NEW_LOGIN_CODE
of fallback DIY code.
-rw-r--r--ChangeLog2
-rw-r--r--bsd-login.c142
-rw-r--r--configure.in2
-rw-r--r--login.c4
4 files changed, 72 insertions, 78 deletions
diff --git a/ChangeLog b/ChangeLog
index a87f32b7..fa1f65be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
- Cleanup of auth.c, login.c and fake-*
- Cleanup of auth-pam.c, save and print "account expired" error messages
- Fix EGD read bug by IWAMURO Motonori <iwa@mmp.fujitsu.co.jp>
+ - Rewrote bsd-login to use proper utmp API if available. Major cleanup
+ of fallback DIY code.
20000530
- Define atexit for old Solaris
diff --git a/bsd-login.c b/bsd-login.c
index ecd5e05a..a6f4acca 100644
--- a/bsd-login.c
+++ b/bsd-login.c
@@ -1,5 +1,5 @@
/*
- * This file has been modified from the original OpenBSD version
+ * This file has been heavily modified from the original OpenBSD version
*/
/* $OpenBSD: login.c,v 1.5 1998/07/13 02:11:12 millert Exp $ */
@@ -74,7 +74,7 @@ struct utmp * utp;
int t = 0;
struct utmp * u;
-#if defined(HAVE_TYPE_IN_UTMP) || defined(HAVE_TYPE_IN_UTMPX)
+# if defined(HAVE_TYPE_IN_UTMP) || defined(HAVE_TYPE_IN_UTMPX)
setutent();
while((u = getutent()) != NULL) {
@@ -93,35 +93,47 @@ struct utmp * utp;
}
endutent();
-#endif
+# endif /* defined(HAVE_TYPE_IN_UTMP) || defined(HAVE_TYPE_IN_UTMPX) */
return(-1);
}
-#else
-int find_tty_slot( utp )
-struct utmp * utp;
+#else /* USER_PROCESS */
+int find_tty_slot(struct utmp *utp)
{
return(ttyslot());
}
-#endif
+#endif /* USER_PROCESS */
#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
-void
-login(utp,utx)
- struct utmp *utp;
- struct utmpx *utx;
+void login(struct utmpx *utx)
#else /* defined(HAVE_UTMPX_H) && defined(USE_UTMPX) */
-void
-login(utp)
- struct utmp *utp;
+void login(struct utmp *utp)
#endif /* defined(HAVE_UTMPX_H) && defined(USE_UTMPX) */
{
-#if defined(HAVE_HOST_IN_UTMP)
- struct utmp old_ut;
-#endif
-#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
- struct utmpx *old_utx;
-#endif /* defined(HAVE_UTMPX_H) && defined(USE_UTMPX) */
- register int fd;
+ /* Use proper API if we have it */
+#if defined(USE_UTMPX)
+# if defined(HAVE_PUTUTXLINE)
+ setutxent();
+ pututxline(utx);
+ endutxent();
+# endif /* defined(HAVE_PUTUTXLINE) */
+# if defined(HAVE_UPDWTMPX)
+ updwtmpx(_PATH_WTMPX, utx);
+# endif /* defined(HAVE_UPDWTMPX) */
+#else /* defined(USE_UTMPX) */
+# if defined(HAVE_PUTUTLINE)
+ setutent();
+ pututline(utp);
+ endutent();
+# endif /* defined(HAVE_PUTUTLINE) */
+# if defined(HAVE_UPDWTMPX)
+ updwtmp(_PATH_WTMP, utp);
+# endif /* defined(HAVE_UPDWTMP) */
+#endif /* defined(USE_UTMPX) */
+
+ /* Otherwise DIY */
+#if (defined(USE_UTMPX) && !defined(HAVE_PUTUTXLINE)) || \
+ (!defined(USE_UTMPX) && !defined(HAVE_PUTUTLINE))
+ int fd;
int tty;
/* can't use ttyslot here, as that will not work for logout
@@ -132,72 +144,52 @@ login(utp)
tty = find_tty_slot(utp);
#ifdef USE_UTMPX
+ /* If no tty was found, append it to utmpx */
+ if (tty == -1) {
+ if ((fd = open(_PATH_UTMPX, O_WRONLY|O_APPEND, 0)) >= 0) {
+ (void)write(fd, utp, sizeof(struct utmp));
+ (void)close(fd);
+ return;
+ }
+ }
+ /* Otherwise, tty was found - update at its location */
fd = open(_PATH_UTMPX, O_RDWR|O_CREAT, 0644);
if (fd == -1) {
log("Couldn't open %s: %s", _PATH_UTMPX, strerror(errno));
+ return;
+ }
+ lseek(fd, (off_t)(tty * sizeof(struct utmpx)), SEEK_SET);
+ write(fd, utx, sizeof(struct utmpx));
+ close(fd);
+ if ((fd = open(_PATH_WTMPX, O_WRONLY|O_APPEND, 0)) >= 0) {
+ (void)write(fd, utx, sizeof(struct utmpx));
+ (void)close(fd);
+ }
#else /* USE_UTMPX */
- fd = open(_PATH_UTMP, O_RDWR|O_CREAT, 0644);
- if (fd == -1) {
- log("Couldn't open %s: %s", _PATH_UTMP, strerror(errno));
-#endif /* USE_UTMPX */
- } else {
- /* If no tty was found... */
- if (tty == -1) {
- /* ... append it to utmp on login */
-#if defined(HAVE_TYPE_IN_UTMP) || defined(HAVE_TYPE_IN_UTMPX)
- if (utp->ut_type == USER_PROCESS) {
-#ifdef USE_UTMPX
- if ((fd = open(_PATH_UTMPX, O_WRONLY|O_APPEND, 0)) >= 0) {
-#else /* USE_UTMPX */
- if ((fd = open(_PATH_UTMP, O_WRONLY|O_APPEND, 0)) >= 0) {
-#endif /* USE_UTMPX */
- (void)write(fd, utp, sizeof(struct utmp));
- (void)close(fd);
- }
- } else {
- /* Shouldn't get to here unless somthing happened to utmp */
- /* Between login and logout */
- log("No tty slot found at logout");
- }
-#endif
- } else {
- /* Otherwise, tty was found - update at its location */
-#if defined(HAVE_HOST_IN_UTMP)
-# ifndef UT_LINESIZE
-# define UT_LINESIZE (sizeof(old_ut.ut_line))
-# define UT_NAMESIZE (sizeof(old_ut.ut_name))
-# define UT_HOSTSIZE (sizeof(old_ut.ut_host))
-# endif
- (void)lseek(fd, (off_t)(tty * sizeof(struct utmp)), SEEK_SET);
- /*
- * Prevent luser from zero'ing out ut_host.
- * If the new ut_line is empty but the old one is not
- * and ut_line and ut_name match, preserve the old ut_line.
- */
- if (read(fd, &old_ut, sizeof(struct utmp)) ==
- sizeof(struct utmp) && utp->ut_host[0] == '\0' &&
- old_ut.ut_host[0] != '\0' &&
- strncmp(old_ut.ut_line, utp->ut_line, UT_LINESIZE) == 0 &&
- strncmp(old_ut.ut_name, utp->ut_name, UT_NAMESIZE) == 0)
- (void)memcpy(utp->ut_host, old_ut.ut_host, UT_HOSTSIZE);
-#endif /* defined(HAVE_HOST_IN_UTMP) */
- (void)lseek(fd, (off_t)(tty * sizeof(struct utmp)), SEEK_SET);
+ /* If no tty was found, append it to utmp */
+ if (tty == -1) {
+ if ((fd = open(_PATH_UTMP, O_WRONLY|O_APPEND, 0)) >= 0) {
(void)write(fd, utp, sizeof(struct utmp));
(void)close(fd);
+ return;
}
}
-
+ /* Otherwise, tty was found - update at its location */
+ fd = open(_PATH_UTMP, O_RDWR|O_CREAT, 0644);
+ if (fd == -1) {
+ log("Couldn't open %s: %s", _PATH_UTMP, strerror(errno));
+ return;
+ }
+ lseek(fd, (off_t)(tty * sizeof(struct utmp)), SEEK_SET);
+ write(fd, utp, sizeof(struct utmp));
+ close(fd);
if ((fd = open(_PATH_WTMP, O_WRONLY|O_APPEND, 0)) >= 0) {
(void)write(fd, utp, sizeof(struct utmp));
(void)close(fd);
}
-#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
- old_utx = pututxline(utx);
-# ifdef HAVE_UPDWTMPX
- updwtmpx(_PATH_WTMPX, utx);
-# endif /* HAVE_UPDWTMPX */
- endutxent();
-#endif /* defined(HAVE_UTMPX_H) && defined(USE_UTMPX) */
+#endif /* USE_UTMPX */
+#endif /* (defined(USE_UTMPX) && !defined(HAVE_PUTUTXLINE)) || \
+ (!defined(USE_UTMPX) && !defined(HAVE_PUTUTLINE)) */
}
#endif /* HAVE_LOGIN */
diff --git a/configure.in b/configure.in
index 3c6694db..86284aa2 100644
--- a/configure.in
+++ b/configure.in
@@ -135,7 +135,7 @@ fi
AC_CHECK_HEADERS(bstring.h endian.h lastlog.h login.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h stddef.h util.h utmp.h utmpx.h)
# Checks for library functions.
-AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_af clock freeaddrinfo gai_strerror getaddrinfo getnameinfo getrusage innetgr md5_crypt memmove mkdtemp on_exit openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmpx vsnprintf vhangup _getpty __b64_ntop)
+AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_af clock freeaddrinfo gai_strerror getaddrinfo getnameinfo getrusage innetgr md5_crypt memmove mkdtemp on_exit openpty pututline pututxline rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmp updwtmpx vsnprintf vhangup _getpty __b64_ntop)
AC_CHECK_FUNC(login,
[AC_DEFINE(HAVE_LOGIN)],
diff --git a/login.c b/login.c
index 6fdc71e6..09e73b3d 100644
--- a/login.c
+++ b/login.c
@@ -18,7 +18,7 @@
*/
#include "includes.h"
-RCSID("$Id: login.c,v 1.29 2000/05/31 01:20:12 damien Exp $");
+RCSID("$Id: login.c,v 1.30 2000/05/31 03:57:19 damien Exp $");
#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
# include <utmpx.h>
@@ -253,7 +253,7 @@ record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid,
#endif /* defined(HAVE_UTMPX_H) && defined(USE_UTMPX) */
#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
- login(&u, &utx);
+ login(&utx);
#else /* defined(HAVE_UTMPX_H) && defined(USE_UTMPX) */
login(&u);
#endif /* defined(HAVE_UTMPX_H) && defined(USE_UTMPX) */