drop support for old external-keyx and gssapi methods

[gssapi-openssh.git] / openssh / sshlogin.c

diff --git a/openssh/sshlogin.c b/openssh/sshlogin.c
index 12555d635fdc4a1123be58ef20e3d27f531d16a2..b7558b9e92561f5e0e7c1da79c6a9b021278263a 100644 (file)
--- a/openssh/sshlogin.c
+++ b/openssh/sshlogin.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshlogin.c,v 1.5 2002/08/29 15:57:25 stevesk Exp $");
+RCSID("$OpenBSD: sshlogin.c,v 1.2 2001/03/24 16:43:27 stevesk Exp $");
 
 #include "loginrec.h"
 
@@ -48,9 +48,10 @@ RCSID("$OpenBSD: sshlogin.c,v 1.5 2002/08/29 15:57:25 stevesk Exp $");
  * 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
 get_last_login_time(uid_t uid, const char *logname,
-    char *buf, u_int bufsize)
+                   char *buf, u_int bufsize)
 {
   struct logininfo li;
 
@@ -63,14 +64,15 @@ get_last_login_time(uid_t uid, const char *logname,
  * Records that the user has logged in.  I these parts of operating systems
  * were more standardized.
  */
+
 void
 record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid,
-    const char *host, struct sockaddr * addr, socklen_t addrlen)
+            const char *host, struct sockaddr * addr)
 {
   struct logininfo *li;
 
   li = login_alloc_entry(pid, user, host, ttyname);
-  login_set_addr(li, addr, addrlen);
+  login_set_addr(li, addr, sizeof(struct sockaddr));
   login_login(li);
   login_free_entry(li);
 }
@@ -78,24 +80,25 @@ record_login(pid_t pid, const char *ttyname, 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)
 {
   struct logininfo *li;
 
   li = login_alloc_entry(pid, user, host, ttyname);
-  login_set_addr(li, addr, addrlen);
+  login_set_addr(li, addr, sizeof(struct sockaddr));
   login_utmp_only(li);
   login_free_entry(li);
 }
 #endif
 
 /* Records that the user has logged out. */
+
 void
-record_logout(pid_t pid, const char *ttyname, const char *user)
+record_logout(pid_t pid, const char *ttyname)
 {
   struct logininfo *li;
 
-  li = login_alloc_entry(pid, user, NULL, ttyname);
+  li = login_alloc_entry(pid, NULL, NULL, ttyname);
   login_logout(li);
   login_free_entry(li);
 }