diff options
author | Damien Miller <djm@mindrot.org> | 2002-09-04 16:45:09 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-09-04 16:45:09 +1000 |
commit | ebc230662977241a9fd9c68034de849772d39438 (patch) | |
tree | 9cb04f9853c894f86e2ec185e182460eb30d5cac /session.c | |
parent | af65304a3c99a9a68d507ce0aefd2e7983eb396b (diff) |
- stevesk@cvs.openbsd.org 2002/08/29 15:57:25
[monitor.c session.c sshlogin.c sshlogin.h]
pass addrlen with sockaddr *; from Hajimu UMEMOTO <ume@FreeBSD.org>
NOTE: there are also p-specific parts to this patch. ok markus@
Diffstat (limited to 'session.c')
-rw-r--r-- | session.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.147 2002/08/22 21:45:41 markus Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.148 2002/08/29 15:57:25 stevesk Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -671,8 +671,8 @@ do_pre_login(Session *s) | |||
671 | * the address be 0.0.0.0. | 671 | * the address be 0.0.0.0. |
672 | */ | 672 | */ |
673 | memset(&from, 0, sizeof(from)); | 673 | memset(&from, 0, sizeof(from)); |
674 | fromlen = sizeof(from); | ||
674 | if (packet_connection_is_on_socket()) { | 675 | if (packet_connection_is_on_socket()) { |
675 | fromlen = sizeof(from); | ||
676 | if (getpeername(packet_get_connection_in(), | 676 | if (getpeername(packet_get_connection_in(), |
677 | (struct sockaddr *) & from, &fromlen) < 0) { | 677 | (struct sockaddr *) & from, &fromlen) < 0) { |
678 | debug("getpeername: %.100s", strerror(errno)); | 678 | debug("getpeername: %.100s", strerror(errno)); |
@@ -737,7 +737,7 @@ do_login(Session *s, const char *command) | |||
737 | record_login(pid, s->tty, pw->pw_name, pw->pw_uid, | 737 | record_login(pid, s->tty, pw->pw_name, pw->pw_uid, |
738 | get_remote_name_or_ip(utmp_len, | 738 | get_remote_name_or_ip(utmp_len, |
739 | options.verify_reverse_mapping), | 739 | options.verify_reverse_mapping), |
740 | (struct sockaddr *)&from); | 740 | (struct sockaddr *)&from, fromlen); |
741 | 741 | ||
742 | #ifdef USE_PAM | 742 | #ifdef USE_PAM |
743 | /* | 743 | /* |