- (tim) [configure.ac] Add AC_REVISION. Add sys/time.h to lastlog.h test

[openssh.git] / sshlogin.c

diff --git a/sshlogin.c b/sshlogin.c
index 1d9c031c40978a93d79ff25394fed76460649c2f..15eb916d162b3753c841b6fd3d8d47f376c210d0 100644 (file)
--- a/sshlogin.c
+++ b/sshlogin.c
@@ -39,52 +39,104 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshlogin.c,v 1.2 2001/03/24 16:43:27 stevesk Exp $");
+RCSID("$OpenBSD: sshlogin.c,v 1.13 2004/08/12 09:18:24 djm Exp $");
 
 #include "loginrec.h"
+#include "log.h"
+#include "buffer.h"
+#include "servconf.h"
+
+extern Buffer loginmsg;
+extern ServerOptions options;
 
 /*
  * Returns the time when the user last logged in.  Returns 0 if the
  * information is not available.  This must be called before record_login.
  * The host the user logged in from will be returned in buf.
  */
-
 u_long
 get_last_login_time(uid_t uid, const char *logname,
-                   char *buf, u_int bufsize)
+    char *buf, u_int bufsize)
+{
+       struct logininfo li;
+
+       login_get_lastlog(&li, uid);
+       strlcpy(buf, li.hostname, bufsize);
+       return li.tv_sec;
+}
+
+/*
+ * Generate and store last login message.  This must be done before
+ * login_login() is called and lastlog is updated.
+ */
+static void
+store_lastlog_message(const char *user, uid_t uid)
 {
-  struct logininfo li;
+       char *time_string, hostname[MAXHOSTNAMELEN] = "", buf[512];
+       time_t last_login_time;
 
-  login_get_lastlog(&li, uid);
-  strlcpy(buf, li.hostname, bufsize);
-  return li.tv_sec;
+#ifndef NO_SSH_LASTLOG
+       if (!options.print_lastlog)
+               return;
+
+       last_login_time = get_last_login_time(uid, user, hostname,
+           sizeof(hostname));
+
+       if (last_login_time != 0) {
+               time_string = ctime(&last_login_time);
+               if (strchr(time_string, '\n'))
+                   *strchr(time_string, '\n') = '\0';
+               if (strcmp(hostname, "") == 0)
+                       snprintf(buf, sizeof(buf), "Last login: %s\r\n",
+                           time_string);
+               else
+                       snprintf(buf, sizeof(buf), "Last login: %s from %s\r\n",
+                           time_string, hostname);
+               buffer_append(&loginmsg, buf, strlen(buf));
+       }
+#endif /* NO_SSH_LASTLOG */
 }
 
 /*
- * Records that the user has logged in.  I these parts of operating systems
- * were more standardized.
+ * Records that the user has logged in.  I wish these parts of operating
+ * systems were more standardized.
  */
+void
+record_login(pid_t pid, const char *tty, const char *user, uid_t uid,
+    const char *host, struct sockaddr * addr, socklen_t addrlen)
+{
+       struct logininfo *li;
 
+       /* save previous login details before writing new */
+       store_lastlog_message(user, uid);
+
+       li = login_alloc_entry(pid, user, host, tty);
+       login_set_addr(li, addr, addrlen);
+       login_login(li);
+       login_free_entry(li);
+}
+
+#ifdef LOGIN_NEEDS_UTMPX
 void
-record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid,
-            const char *host, struct sockaddr * addr)
+record_utmp_only(pid_t pid, const char *ttyname, const char *user,
+                const char *host, struct sockaddr * addr, socklen_t addrlen)
 {
-  struct logininfo *li;
+       struct logininfo *li;
 
-  li = login_alloc_entry(pid, user, host, ttyname);
-  login_set_addr(li, addr, sizeof(struct sockaddr));
-  login_login(li);
-  login_free_entry(li);
+       li = login_alloc_entry(pid, user, host, ttyname);
+       login_set_addr(li, addr, addrlen);
+       login_utmp_only(li);
+       login_free_entry(li);
 }
+#endif
 
 /* Records that the user has logged out. */
-
 void
-record_logout(pid_t pid, const char *ttyname)
+record_logout(pid_t pid, const char *tty, const char *user)
 {
-  struct logininfo *li;
+       struct logininfo *li;
 
-  li = login_alloc_entry(pid, NULL, NULL, ttyname);
-  login_logout(li);
-  login_free_entry(li);
+       li = login_alloc_entry(pid, user, NULL, tty);
+       login_logout(li);
+       login_free_entry(li);
 }