- stevesk@cvs.openbsd.org 2006/07/11 20:07:25

[openssh.git] / sshlogin.c

diff --git a/sshlogin.c b/sshlogin.c
index b82c45c5c7fbccd9407a4b7da1bbcf8bd9b8805b..808ad605eb250e85f3f1d370b9fc95ea11b29fb9 100644 (file)
--- a/sshlogin.c
+++ b/sshlogin.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: sshlogin.c,v 1.19 2006/07/11 20:07:25 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -39,7 +40,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshlogin.c,v 1.12 2004/08/11 12:01:16 djm Exp $");
+
+#include <errno.h>
+#include <fcntl.h>
 
 #include "loginrec.h"
 #include "log.h"
@@ -54,15 +57,15 @@ extern ServerOptions options;
  * 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
+time_t
 get_last_login_time(uid_t uid, const char *logname,
-    char *buf, u_int bufsize)
+    char *buf, size_t bufsize)
 {
        struct logininfo li;
 
        login_get_lastlog(&li, uid);
        strlcpy(buf, li.hostname, bufsize);
-       return li.tv_sec;
+       return (time_t)li.tv_sec;
 }
 
 /*
@@ -103,7 +106,7 @@ store_lastlog_message(const char *user, uid_t uid)
  */
 void
 record_login(pid_t pid, const char *tty, const char *user, uid_t uid,
-    const char *host, struct sockaddr * addr, socklen_t addrlen)
+    const char *host, struct sockaddr *addr, socklen_t addrlen)
 {
        struct logininfo *li;
 
@@ -119,7 +122,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;