- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / sshlogin.c

diff --git a/sshlogin.c b/sshlogin.c
index 335069313a2ff7184edae2374c9af82b9a5cfd30..33bd652fb0b5f2be1dbc079b5986f3742e7fdc79 100644 (file)
--- a/sshlogin.c
+++ b/sshlogin.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshlogin.c,v 1.20 2006/07/17 01:31:10 stevesk Exp $ */
+/* $OpenBSD: sshlogin.c,v 1.26 2007/09/11 15:47:17 gilles Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -42,9 +42,17 @@
 #include "includes.h"
 
 #include <sys/types.h>
+#include <sys/param.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
 
 #include <errno.h>
 #include <fcntl.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include "loginrec.h"
@@ -78,20 +86,26 @@ get_last_login_time(uid_t uid, const char *logname,
 static void
 store_lastlog_message(const char *user, uid_t uid)
 {
+#ifndef NO_SSH_LASTLOG
        char *time_string, hostname[MAXHOSTNAMELEN] = "", buf[512];
        time_t last_login_time;
 
-#ifndef NO_SSH_LASTLOG
        if (!options.print_lastlog)
                return;
 
+# ifdef CUSTOM_SYS_AUTH_GET_LASTLOGIN_MSG
+       time_string = sys_auth_get_lastlogin_msg(user, uid);
+       if (time_string != NULL) {
+               buffer_append(&loginmsg, time_string, strlen(time_string));
+               xfree(time_string);
+       }
+# else
        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';
+               time_string[strcspn(time_string, "\n")] = '\0';
                if (strcmp(hostname, "") == 0)
                        snprintf(buf, sizeof(buf), "Last login: %s\r\n",
                            time_string);
@@ -100,6 +114,7 @@ store_lastlog_message(const char *user, uid_t uid)
                            time_string, hostname);
                buffer_append(&loginmsg, buf, strlen(buf));
        }
+# endif /* CUSTOM_SYS_AUTH_GET_LASTLOGIN_MSG */
 #endif /* NO_SSH_LASTLOG */
 }