- (stevesk) [session.c sshlogin.c sshlogin.h] complete portable

    parts of pass addrlen with sockaddr * fix.
    from Hajimu UMEMOTO <ume@FreeBSD.org>

diff --git a/ChangeLog b/ChangeLog
index 70fad2c8d6acac752bc0645ad8df7b0866d970a3..00d1d7e96bab9c8a2513a01e8e75b8fd4ee0e38b 100644 (file)
--- 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
 20021222
  - (bal) OpenBSD CVS Sync
    - fgsch@cvs.openbsd.org 2002/11/15 10:03:09

diff --git a/session.c b/session.c
index dfff9c6bf95cfe249b4c274cb4defd62f9b6afab..90d59513ca9294f5e158a1a22572a93bdd3011f3 100644 (file)
--- a/session.c
+++ b/session.c
@@ -689,7 +689,7 @@ do_pre_login(Session *s)
 
        record_utmp_only(pid, s->tty, s->pw->pw_name,
            get_remote_name_or_ip(utmp_len, options.verify_reverse_mapping),
 
        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
 
 }
 #endif
 


@@ -730,8 +730,8 @@ do_login(Session *s, const char *command)
         * the address be 0.0.0.0.
         */
        memset(&from, 0, sizeof(from));
         * the address be 0.0.0.0.
         */
        memset(&from, 0, sizeof(from));

+       fromlen = sizeof(from);

        if (packet_connection_is_on_socket()) {
        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));
                if (getpeername(packet_get_connection_in(),
                    (struct sockaddr *) & from, &fromlen) < 0) {
                        debug("getpeername: %.100s", strerror(errno));

diff --git a/sshlogin.c b/sshlogin.c
index 4cd1c0059c54418ab4344670a7d6ffb135ed3715..12555d635fdc4a1123be58ef20e3d27f531d16a2 100644 (file)
--- a/sshlogin.c
+++ b/sshlogin.c
@@ -70,7 +70,7 @@ record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid,
   struct logininfo *li;
 
   li = login_alloc_entry(pid, user, host, ttyname);
   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);
 }
   login_login(li);
   login_free_entry(li);
 }


@@ -78,12 +78,12 @@ 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,
 #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);
 {
   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);
 }
   login_utmp_only(li);
   login_free_entry(li);
 }

diff --git a/sshlogin.h b/sshlogin.h
index 287c0d9f6a14163e1c4743437b118d0fbd1e0afc..1c8bfad3233bff973c0fa8aa3579d42a6f63d921 100644 (file)
--- a/sshlogin.h
+++ b/sshlogin.h
@@ -22,7 +22,7 @@ u_long         get_last_login_time(uid_t, const char *, char *, u_int);
 
 #ifdef LOGIN_NEEDS_UTMPX
 void   record_utmp_only(pid_t, const char *, const char *, const char *,
 
 #ifdef LOGIN_NEEDS_UTMPX
 void   record_utmp_only(pid_t, const char *, const char *, const char *,

-               struct sockaddr *);
+               struct sockaddr *, socklen_t);

 #endif
 
 #endif
 #endif
 
 #endif