=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshlogin.c,v retrieving revision 1.13.8.1 retrieving revision 1.14 diff -u -r1.13.8.1 -r1.14 --- src/usr.bin/ssh/sshlogin.c 2006/09/30 04:06:51 1.13.8.1 +++ src/usr.bin/ssh/sshlogin.c 2006/03/19 18:51:19 1.14 @@ -1,4 +1,3 @@ -/* $OpenBSD: sshlogin.c,v 1.13.8.1 2006/09/30 04:06:51 brad Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -39,20 +38,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include -#include +#include "includes.h" -#include -#include -#include -#include -#include -#include #include #include -#include - #include "sshlogin.h" #include "log.h" #include "buffer.h" @@ -66,9 +55,9 @@ * information is not available. This must be called before record_login. * The host the user logged in from will be returned in buf. */ -time_t +u_long get_last_login_time(uid_t uid, const char *logname, - char *buf, size_t bufsize) + char *buf, u_int bufsize) { struct lastlog ll; char *lastlog; @@ -101,7 +90,7 @@ bufsize = sizeof(ll.ll_host) + 1; strncpy(buf, ll.ll_host, bufsize - 1); buf[bufsize - 1] = '\0'; - return (time_t)ll.ll_time; + return ll.ll_time; } /* @@ -140,7 +129,7 @@ */ 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) { int fd; struct lastlog ll;