+/*
+ * This file has been modified from the original OpenBSD version
+ */
+
/* $OpenBSD: login.c,v 1.5 1998/07/13 02:11:12 millert Exp $ */
/*
* Copyright (c) 1988, 1993
#include "config.h"
#ifndef HAVE_LOGIN
+#include <errno.h>
+
#if defined(LIBC_SCCS) && !defined(lint)
/* from: static char sccsid[] = "@(#)login.c 8.1 (Berkeley) 6/4/93"; */
static char *rcsid = "$OpenBSD: login.c,v 1.5 1998/07/13 02:11:12 millert Exp $";
#include <stdio.h>
#include <string.h>
+#ifdef USER_PROCESS
+/*
+ * find first matching slot in utmp, or "-1" for none
+ *
+ * algorithm: for USER_PROCESS, check tty name
+ * for DEAD_PROCESS, check PID and tty name
+ *
+ */
+int find_tty_slot( utp )
+struct utmp * utp;
+{
+ int t = 0;
+ struct utmp * u;
+
+#if defined(HAVE_TYPE_IN_UTMP) || defined(HAVE_TYPE_IN_UTMPX)
+ setutent();
+
+ while((u = getutent()) != NULL) {
+ if (utp->ut_type == USER_PROCESS &&
+ (strncmp(utp->ut_line, u->ut_line, sizeof(utp->ut_line)) == 0)) {
+ endutent();
+ return(t);
+ }
+
+ if ((utp->ut_type == DEAD_PROCESS) && (utp->ut_pid == u->ut_pid) &&
+ (strncmp(utp->ut_line, u->ut_line, sizeof(utp->ut_line)) == 0 )) {
+ endutent();
+ return(t);
+ }
+ t++;
+ }
+
+ endutent();
+#endif
+ return(-1);
+}
+#else
+int find_tty_slot( utp )
+struct utmp * utp;
+{
+ return(ttyslot());
+}
+#endif
+
+#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
+void
+login(utp,utx)
+ struct utmp *utp;
+ struct utmpx *utx;
+#else /* defined(HAVE_UTMPX_H) && defined(USE_UTMPX) */
void
login(utp)
- struct UTMP_STR *utp;
+ struct utmp *utp;
+#endif /* defined(HAVE_UTMPX_H) && defined(USE_UTMPX) */
{
- struct UTMP_STR old_ut;
+#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;
int tty;
-#ifndef UT_LINESIZE
-# define UT_LINESIZE (sizeof(old_ut.ut_line))
-# if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
-# define UT_NAMESIZE (sizeof(old_ut.ut_user))
-# else
+ /* can't use ttyslot here, as that will not work for logout
+ * (record_logout() is called from the master sshd, which does
+ * not have the correct tty on stdin/out, so ttyslot will return
+ * "-1" or (worse) a wrong number
+ */
+ tty = find_tty_slot(utp);
+
+#ifdef USE_UTMPX
+ fd = open(_PATH_UTMPX, O_RDWR|O_CREAT, 0644);
+ if (fd == -1) {
+ log("Couldn't open %s: %s", _PATH_UTMPX, strerror(errno));
+#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))
-# endif
-# ifdef HAVE_HOST_IN_UTMP
-# define UT_HOSTSIZE (sizeof(old_ut.ut_host))
-# endif
-# if defined(HAVE_HOST_IN_UTMPX) && defined(USE_UTMPX)
# define UT_HOSTSIZE (sizeof(old_ut.ut_host))
# endif
-#endif
-
- tty = ttyslot();
- if (tty > 0 && (fd = open(_PATH_UTMP, O_RDWR|O_CREAT, 0644)) >= 0) {
-#if defined(HAVE_HOST_IN_UTMP) || defined(HAVE_HOST_IN_UTMPX)
- (void)lseek(fd, (off_t)(tty * sizeof(struct UTMP_STR)), 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_STR)) ==
- sizeof(struct UTMP_STR) && 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) || defined(HAVE_HOST_IN_UTMPX) */
- (void)lseek(fd, (off_t)(tty * sizeof(struct UTMP_STR)), SEEK_SET);
- (void)write(fd, utp, sizeof(struct UTMP_STR));
- (void)close(fd);
+ (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);
+ (void)write(fd, utp, sizeof(struct utmp));
+ (void)close(fd);
+ }
}
+
if ((fd = open(_PATH_WTMP, O_WRONLY|O_APPEND, 0)) >= 0) {
- (void)write(fd, utp, sizeof(struct UTMP_STR));
+ (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 /* HAVE_LOGIN */
andersk / openssh.git / blobdiff