- (djm) Stop shadow expiry checking from preventing logins with NIS. Based

[openssh.git] / login.c

diff --git a/login.c b/login.c
index 335e9b303d35164bd1ad6856ddfbcb02e7e4dd96..c50721823b41495c9bc415bfb96283e17abbab31 100644 (file)
--- a/login.c
+++ b/login.c
@@ -1,42 +1,26 @@
 /*
- * 
+ *
  * login.c
- * 
+ *
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
- * 
+ *
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
- * 
+ *
  * Created: Fri Mar 24 14:51:08 1995 ylo
- * 
+ *
  * This file performs some of the things login(1) normally does.  We cannot
  * easily use something like login -p -h host -f user, because there are
  * several different logins around, and it is hard to determined what kind of
  * login the current system has.  Also, we want to be able to execute commands
  * on a tty.
- * 
+ *
  */
 
 #include "includes.h"
-RCSID("$Id$");
+RCSID("$OpenBSD: login.c,v 1.14 2000/06/20 01:39:42 markus Exp $");
 
-#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
-# include <utmpx.h>
-#endif
-#ifdef HAVE_UTMP_H
-# include <utmp.h>
-#endif
-#include "ssh.h"
-
-#ifdef HAVE_UTIL_H
-# include <util.h>
-#endif
-#ifdef HAVE_LASTLOG_H
-# include <lastlog.h>
-#endif
-#ifdef HAVE_LOGIN_H
-# include <login.h>
-#endif
+#include "loginrec.h"
 
 /*
  * Returns the time when the user last logged in.  Returns 0 if the
@@ -44,36 +28,15 @@ RCSID("$Id$");
  * The host the user logged in from will be returned in buf.
  */
 
-/*
- * Returns the time when the user last logged in (or 0 if no previous login
- * is found).  The name of the host used last time is returned in buf.
- */
-
-unsigned long 
+unsigned long
 get_last_login_time(uid_t uid, const char *logname,
                    char *buf, unsigned int bufsize)
 {
-       struct lastlog ll;
-       char *lastlog;
-       int fd;
-
-       lastlog = _PATH_LASTLOG;
-       buf[0] = '\0';
+  struct logininfo li;
 
-       fd = open(lastlog, O_RDONLY);
-       if (fd < 0)
-               return 0;
-       lseek(fd, (off_t) ((long) uid * sizeof(ll)), SEEK_SET);
-       if (read(fd, &ll, sizeof(ll)) != sizeof(ll)) {
-               close(fd);
-               return 0;
-       }
-       close(fd);
-       if (bufsize > sizeof(ll.ll_host) + 1)
-               bufsize = sizeof(ll.ll_host) + 1;
-       strncpy(buf, ll.ll_host, bufsize - 1);
-       buf[bufsize - 1] = 0;
-       return ll.ll_time;
+  login_get_lastlog(&li, uid);
+  strlcpy(buf, li.hostname, bufsize);
+  return li.tv_sec;
 }
 
 /*
@@ -81,69 +44,26 @@ get_last_login_time(uid_t uid, const char *logname,
  * were more standardized.
  */
 
-void 
-record_login(int pid, const char *ttyname, const char *user, uid_t uid,
-            const char *host, struct sockaddr_in * addr)
+void
+record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid,
+            const char *host, struct sockaddr * addr)
 {
-       int fd;
-       struct lastlog ll;
-       char *lastlog;
-       struct UTMP_STR u;
-       const char *utmp, *wtmp;
+  struct logininfo *li;
 
-       /* Construct an utmp/wtmp entry. */
-       memset(&u, 0, sizeof(u));
-       strncpy(u.ut_line, ttyname + 5, sizeof(u.ut_line));
-#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
-       u.ut_tv.tv_sec = time(NULL);
-       strncpy(u.ut_user, user, sizeof(u.ut_name));
-#else
-       u.ut_time = time(NULL);
-       strncpy(u.ut_name, user, sizeof(u.ut_name));
-#endif
-#if defined(HAVE_HOST_IN_UTMP) || defined(HAVE_HOST_IN_UTMPX)
-       strncpy(u.ut_host, host, sizeof(u.ut_host));
-#endif
-
-       /* Figure out the file names. */
-       utmp = _PATH_UTMP;
-       wtmp = _PATH_WTMP;
-
-       login(&u);
-       lastlog = _PATH_LASTLOG;
-
-       /* Update lastlog unless actually recording a logout. */
-       if (strcmp(user, "") != 0) {
-               /*
-                * It is safer to bzero the lastlog structure first because
-                * some systems might have some extra fields in it (e.g. SGI)
-                */
-               memset(&ll, 0, sizeof(ll));
-
-               /* Update lastlog. */
-               ll.ll_time = time(NULL);
-               strncpy(ll.ll_line, ttyname + 5, sizeof(ll.ll_line));
-               strncpy(ll.ll_host, host, sizeof(ll.ll_host));
-               fd = open(lastlog, O_RDWR);
-               if (fd >= 0) {
-                       lseek(fd, (off_t) ((long) uid * sizeof(ll)), SEEK_SET);
-                       if (write(fd, &ll, sizeof(ll)) != sizeof(ll))
-                               log("Could not write %.100s: %.100s", lastlog, strerror(errno));
-                       close(fd);
-               }
-       }
+  li = login_alloc_entry(pid, user, host, ttyname);
+  login_set_addr(li, addr, sizeof(struct sockaddr));
+  login_login(li);
+  login_free_entry(li);
 }
 
 /* Records that the user has logged out. */
 
-void 
-record_logout(int pid, const char *ttyname)
+void
+record_logout(pid_t pid, const char *ttyname)
 {
-#ifdef HAVE_LIBUTIL_LOGIN
-       const char *line = ttyname + 5; /* /dev/ttyq8 -> ttyq8 */
-       if (logout(line))
-               logwtmp(line, "", "");
-#else /* HAVE_LIBUTIL_LOGIN */
-       record_login(pid, ttyname, "", -1, "", NULL);
-#endif /* HAVE_LIBUTIL_LOGIN */
+  struct logininfo *li;
+
+  li = login_alloc_entry(pid, NULL, NULL, ttyname);
+  login_logout(li);
+  login_free_entry(li);
 }