commit 678ee51ff3493f0185dcb23bfb9fb2ba299d89b1
author Kevin Steves <stevesk@pobox.com> Wed Jan 01 23:43:55 2003 +0000
committer Kevin Steves <stevesk@pobox.com> Wed Jan 01 23:43:55 2003 +0000
tree 75cf1d0971f4c774f60b7d0eeb3583c6a567f35f
parent 1b96cfb97585459bbb71198123425f7e831e2845

  - (stevesk) [session.c sshlogin.c sshlogin.h] complete portable
    parts of pass addrlen with sockaddr * fix.
    from Hajimu UMEMOTO <ume@FreeBSD.org>

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index bac6b2f..84adce1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20030101
+  - (stevesk) [session.c sshlogin.c sshlogin.h] complete portable
+    parts of pass addrlen with sockaddr * fix.
+    from Hajimu UMEMOTO <ume@FreeBSD.org>
+
 20021222
  - (bal) OpenBSD CVS Sync
    - fgsch@cvs.openbsd.org 2002/11/15 10:03:09
@@ -912,4 +917,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2536 2002/12/23 02:58:17 mouring Exp $
+$Id: ChangeLog,v 1.2537 2003/01/01 23:43:55 stevesk Exp $

session.c

diff --git a/session.c b/session.c
index dfff9c6..90d5951 100644
--- a/session.c
+++ b/session.c
@@ -689,7 +689,7 @@
 
 	record_utmp_only(pid, s->tty, s->pw->pw_name,
 	    get_remote_name_or_ip(utmp_len, options.verify_reverse_mapping),
-	    (struct sockaddr *)&from);
+	    (struct sockaddr *)&from, fromlen);
 }
 #endif
 
@@ -730,8 +730,8 @@
 	 * the address be 0.0.0.0.
 	 */
 	memset(&from, 0, sizeof(from));
+	fromlen = sizeof(from);
 	if (packet_connection_is_on_socket()) {
-		fromlen = sizeof(from);
 		if (getpeername(packet_get_connection_in(),
 		    (struct sockaddr *) & from, &fromlen) < 0) {
 			debug("getpeername: %.100s", strerror(errno));

sshlogin.c

diff --git a/sshlogin.c b/sshlogin.c
index 4cd1c00..12555d6 100644
--- a/sshlogin.c
+++ b/sshlogin.c
@@ -70,7 +70,7 @@
   struct logininfo *li;
 
   li = login_alloc_entry(pid, user, host, ttyname);
-  login_set_addr(li, addr, sizeof(struct sockaddr));
+  login_set_addr(li, addr, addrlen);
   login_login(li);
   login_free_entry(li);
 }
@@ -78,12 +78,12 @@
 #ifdef LOGIN_NEEDS_UTMPX
 void
 record_utmp_only(pid_t pid, const char *ttyname, const char *user,
-		 const char *host, struct sockaddr * addr)
+		 const char *host, struct sockaddr * addr, socklen_t addrlen)
 {
   struct logininfo *li;
 
   li = login_alloc_entry(pid, user, host, ttyname);
-  login_set_addr(li, addr, sizeof(struct sockaddr));
+  login_set_addr(li, addr, addrlen);
   login_utmp_only(li);
   login_free_entry(li);
 }

sshlogin.h

diff --git a/sshlogin.h b/sshlogin.h
index 287c0d9..1c8bfad 100644
--- a/sshlogin.h
+++ b/sshlogin.h
@@ -22,7 +22,7 @@
 
 #ifdef LOGIN_NEEDS_UTMPX
 void	record_utmp_only(pid_t, const char *, const char *, const char *,
-		struct sockaddr *);
+		struct sockaddr *, socklen_t);
 #endif
 
 #endif