- dtucker@cvs.openbsd.org 2004/07/17 05:31:41

     [monitor.c monitor_wrap.c session.c session.h sshd.c sshlogin.c]
     Move "Last logged in at.." message generation to the monitor, right
     before recording the new login.  Fixes missing lastlog message when
     /var/log/lastlog is not world-readable and incorrect datestamp when
     multiple sessions are used (bz #463);  much assistance & ok markus@

1 files changed, 42 insertions, 1 deletions

diff --git a/sshlogin.c b/sshlogin.c
index 75446f9eb..41817ec96 100644
--- a/sshlogin.c
+++ b/sshlogin.c
@@ -39,9 +39,15 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshlogin.c,v 1.9 2004/07/03 05:11:33 dtucker Exp $");
+RCSID("$OpenBSD: sshlogin.c,v 1.10 2004/07/17 05:31:41 dtucker 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
@@ -60,6 +66,38 @@ get_last_login_time(uid_t uid, const char *logname,
 }
 
 /*
+ * Generate and store last login message.  This must be done before
+ * login_login() is called and lastlog is updated.
+ */
+void
+store_lastlog_message(const char *user, uid_t uid)
+{
+        char *time_string, hostname[MAXHOSTNAMELEN] = "", buf[512];
+        time_t last_login_time;
+
+#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 wish these parts of operating
  * systems were more standardized.
  */
@@ -69,6 +107,9 @@ record_login(pid_t pid, const char *tty, const char *user, uid_t uid,
 {
         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);