- stevesk@cvs.openbsd.org 2008/12/29 02:23:26

[openssh.git] / sshlogin.c

diff --git a/sshlogin.c b/sshlogin.c
index 4f65b5e919805766ec06ed1ce17de580db3af5c5..cc35d6024b41a26573055a71091a41c3f27c46b9 100644 (file)
--- a/sshlogin.c
+++ b/sshlogin.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshlogin.c,v 1.17 2006/03/25 18:36:15 deraadt 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
@@ -41,6 +41,20 @@
 
 #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"
 #include "log.h"
 #include "buffer.h"
@@ -84,8 +98,7 @@ store_lastlog_message(const char *user, uid_t uid)
 
        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);
@@ -119,7 +132,7 @@ record_login(pid_t pid, const char *tty, const char *user, uid_t uid,
 #ifdef LOGIN_NEEDS_UTMPX
 void
 record_utmp_only(pid_t pid, const char *ttyname, const char *user,
-                const char *host, struct sockaddr * addr, socklen_t addrlen)
+                const char *host, struct sockaddr *addr, socklen_t addrlen)
 {
        struct logininfo *li;