Added new login recording code

Added test program for login code (make logintest)

1 files changed, 19 insertions, 258 deletions

diff --git a/login.c b/login.c
index 09e73b3de..305b67cbc 100644
--- a/login.c
+++ b/login.c
@@ -18,30 +18,9 @@
  */
 
 #include "includes.h"
-RCSID("$Id: login.c,v 1.30 2000/05/31 03:57:19 damien Exp $");
+RCSID("$Id: login.c,v 1.31 2000/06/03 14:57:40 andre 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
-
-#ifdef WITH_AIXAUTHENTICATE
-/* This is done in do_authentication */
-# define DISABLE_LASTLOG
-#endif /* WITH_AIXAUTHENTICATE */
+#include "loginrec.h"
 
 /*
  * Returns the time when the user last logged in.  Returns 0 if the
@@ -49,248 +28,32 @@ RCSID("$Id: login.c,v 1.30 2000/05/31 03:57:19 damien Exp $");
  * 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
 get_last_login_time(uid_t uid, const char *logname,
                     char *buf, unsigned int bufsize)
 {
-#if defined(_PATH_LASTLOG) && !defined(DISABLE_LASTLOG)
-        struct lastlog ll;
-        int fd;
-# ifdef LASTLOG_IS_DIR
-        char lbuf[1024];
-
-        snprintf(lbuf, sizeof(buf), "%s/%s", _PATH_LASTLOG, logname);
-        if ((fd = open(lbuf, O_RDONLY)) < 0)
-                return 0;
-# else /* LASTLOG_IS_DIR */
-        buf[0] = '\0';
-
-        if ((fd = open(_PATH_LASTLOG, O_RDONLY)) < 0)
-                return 0;
-
-        lseek(fd, (off_t) ((long) uid * sizeof(ll)), SEEK_SET);
-# endif /* LASTLOG_IS_DIR */
-        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;
-#else /* defined(_PATH_LASTLOG) && !defined(DISABLE_LASTLOG) */
-# ifdef HAVE_TYPE_IN_UTMP
-        /* Look in wtmp for the last login */
-        struct utmp  wt;
-        int fd1;
-        unsigned long t = 0;
-
-        if ((fd1 = open(_PATH_WTMP, O_RDONLY)) < 0) {
-                error("Couldn't open %.100s to find last login time.", _PATH_WTMP);
-                return 0;
-        }
-
-        /* seek to last record of file */
-        lseek(fd1, (off_t)(0 - sizeof(struct utmp)), SEEK_END);
-
-        /* loop through wtmp for our last user login record */
-        do {
-                if (read(fd1, &wt, sizeof(wt)) != sizeof(wt)) {
-                        close(fd1);
-                        return 0;
-                }
-
-                if (wt.ut_type == USER_PROCESS) {
-                        if (!strncmp(logname, wt.ut_user, 8)) {
-                                t = (unsigned long)wt.ut_time;
-#  ifdef HAVE_HOST_IN_UTMP
-                                if (bufsize > sizeof(wt.ut_host) + 1)
-                                        bufsize = sizeof(wt.ut_host) + 1;
-                                strncpy(buf, wt.ut_host, bufsize - 1);
-                                buf[bufsize - 1] = 0;
-#  else /* HAVE_HOST_IN_UTMP */
-                                buf[0] = 0;
-#  endif /* HAVE_HOST_IN_UTMP */
-                        }
-                }
+  struct logininfo li;
 
-                if (lseek(fd1, (off_t)(0 - (2 * sizeof(struct utmp))), SEEK_CUR) < 0)
-                        break;
-        } while (t == 0);
-
-        return t;
-# else /* HAVE_TYPE_IN_UTMP */
-        return 0;
-# endif /* HAVE_TYPE_IN_UTMP */
-#endif /* defined(_PATH_LASTLOG) && !defined(DISABLE_LASTLOG) */
+  login_getlastentry_uid(&li, uid);
+  strncpy(buf, li.hostname, bufsize);
+  return li.tv_sec;
 }
 
 /*
- * Records that the user has logged in.  I wish these parts of operating 
- * systems were more standardized.
+ * Records that the user has logged in.  I these parts of operating systems
+ * were more standardized.
  */
+
 void
 record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid,
              const char *host, struct sockaddr * addr)
 {
-#if defined(_PATH_LASTLOG) && !defined(DISABLE_LASTLOG)
-        struct lastlog ll;
-# ifdef LASTLOG_IS_DIR
-        char buf[1024];
-# endif /* LASTLOG_IS_DIR */
-#endif /* defined(_PATH_LASTLOG) && !defined(DISABLE_LASTLOG) */
-        struct utmp u;
-#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
-        struct utmpx utx;
-#endif
-
-        /* Construct an utmp/wtmp entry. */
-        memset(&u, 0, sizeof(u));
-        strncpy(u.ut_line, ttyname + 5, sizeof(u.ut_line));
-        
-#if defined(HAVE_ID_IN_UTMP)
-# ifdef _AIX
-        strncpy(u.ut_id, ttyname + 5, sizeof(u.ut_id));
-# else /* !AIX */
-        strncpy(u.ut_id, ttyname + 8, sizeof(u.ut_id));
-# endif
-#endif /* defined(HAVE_ID_IN_UTMP) */ 
-
-        strncpy(u.ut_name, user, sizeof(u.ut_name));
-        
-#if defined(HAVE_TV_IN_UTMP)
-        (void)gettimeofday(&u.ut_tv, NULL);
-#else /* defined(HAVE_TV_IN_UTMP) */
-        u.ut_time = time(NULL);
-#endif /* defined(HAVE_TV_IN_UTMP) */
-
-#if defined(HAVE_PID_IN_UTMP)
-        u.ut_pid = (pid_t)pid;
-#endif /* HAVE_PID_IN_UTMP */
-
-#if defined(HAVE_TYPE_IN_UTMP)
-        u.ut_type = (uid == -1)?DEAD_PROCESS:USER_PROCESS;
-#endif /* HAVE_TYPE_IN_UTMP */
-
-#if defined(HAVE_HOST_IN_UTMP)
-        strncpy(u.ut_host, host, sizeof(u.ut_host));
-#endif
-
-#if defined(HAVE_ADDR_IN_UTMP)
-        if (addr) {
-                switch (addr->sa_family) {
-                        case AF_INET: {
-                                struct sockaddr_in *in = (struct sockaddr_in*)addr;
-                                memcpy(&(u.ut_addr), &(in->sin_addr), sizeof(&(in->sin_addr)));
-                                break;
-                        }
-# if defined(HAVE_ADDR_V6_IN_UTMP)
-                        case AF_INET6: {
-                                struct sockaddr_in6 *in6 = (struct sockaddr_in6*)addr;
-                                memcpy(u.ut_addr_v6, &(in6->sin6_addr), sizeof(&(in6->sin6_addr)));
-                                break;
-                        }
-# endif /* defined(HAVE_ADDR_V6_IN_UTMP) */
-                        default:
-                                break;
-                }
-        }
-#endif /* defined(HAVE_ADDR_IN_UTMP) */
+  struct logininfo *li;
 
-#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
-        memset(&utx, 0, sizeof(utx));
-
-        strncpy(utx.ut_user, user, sizeof(utx.ut_name));
-        strncpy(utx.ut_line, ttyname + 5, sizeof(utx.ut_line));
-        strncpy(utx.ut_id, ttyname + 8, sizeof(utx.ut_id));
-
-        utx.ut_pid = (pid_t)pid;
-        (void)gettimeofday(&utx.ut_tv, NULL);
-        
-        utx.ut_type = (uid == -1)?DEAD_PROCESS:USER_PROCESS;
-# ifdef HAVE_HOST_IN_UTMPX
-#  ifdef HAVE_SYSLEN_IN_UTMPX
-        utx.ut_syslen = strlen(host);
-        if (utx.ut_syslen + 1 > sizeof(utx.ut_host))
-                utx.ut_syslen = sizeof(utx.ut_host);
-        strncpy(utx.ut_host, host, utx.ut_syslen);
-#  else
-        strncpy(utx.ut_host, host, sizeof(utx.ut_host));
-#  endif /* HAVE_SYSLEN_IN_UTMPX */
-        utx.ut_host[sizeof(utx.ut_host)-1] = '\0';
-# endif
-
-# if defined(HAVE_ADDR_IN_UTMPX)
-        if (addr) {
-                switch (addr->sa_family) {
-                        case AF_INET: {
-                                struct sockaddr_in *in = (struct sockaddr_in*)addr;
-                                memcpy(&(utx.ut_addr), &(in->sin_addr), sizeof(&(in->sin_addr)));
-                                break;
-                        }
-#  if defined(HAVE_ADDR_V6_IN_UTMPX)
-                        case AF_INET6: {
-                                struct sockaddr_in6 *in6 = (struct sockaddr_in6*)addr;
-                                memcpy(utx.ut_addr_v6, &(in6->sin6_addr), sizeof(&(in6->sin6_addr)));
-                                break;
-                        }
-#  endif /* defined(HAVE_ADDR_V6_IN_UTMPX) */
-                        default:
-                                break;
-                }
-        }
-# endif /* defined(HAVE_ADDR_IN_UTMPX) */
-#endif /* defined(HAVE_UTMPX_H) && defined(USE_UTMPX) */
-
-#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
-        login(&utx);
-#else /* defined(HAVE_UTMPX_H) && defined(USE_UTMPX) */
-        login(&u);
-#endif /* defined(HAVE_UTMPX_H) && defined(USE_UTMPX) */
-
-#if defined(_PATH_LASTLOG) && !defined(DISABLE_LASTLOG)
-        /* Update lastlog unless actually recording a logout. */
-        if (strcmp(user, "") != 0) {
-                int fd;
-                /*
-                 * 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));
-# ifdef LASTLOG_IS_DIR
-                snprintf(buf, sizeof(buf), "%s/%s", _PATH_LASTLOG, user);
-                if ((fd = open(buf, O_RDWR)) >= 0) {
-                        if (write(fd, &ll, sizeof(ll)) != sizeof(ll))
-                                log("Could not write %.100s: %.100s", buf, strerror(errno));
-                        close(fd);
-                }
-# else /* LASTLOG_IS_DIR */
-                if ((fd = open(_PATH_LASTLOG, O_RDWR)) >= 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", _PATH_LASTLOG, 
-                                        strerror(errno));
-                        }
-                        close(fd);
-                }
-# endif /* LASTLOG_IS_DIR */
-        }
-#endif /* defined(_PATH_LASTLOG) && !defined(DISABLE_LASTLOG) */
+  li = login_alloc_entry(pid, user, host, ttyname);
+  login_set_ip4(li, (struct sockaddr_in *)addr);
+  login_login(li);
+  login_free_entry(li);
 }
 
 /* Records that the user has logged out. */
@@ -298,11 +61,9 @@ record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid,
 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);
 }