diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | monitor.c | 6 | ||||
-rw-r--r-- | session.c | 6 | ||||
-rw-r--r-- | sshlogin.c | 4 | ||||
-rw-r--r-- | sshlogin.h | 4 |
5 files changed, 15 insertions, 11 deletions
@@ -38,6 +38,10 @@ | |||
38 | - stevesk@cvs.openbsd.org 2002/08/27 17:18:40 | 38 | - stevesk@cvs.openbsd.org 2002/08/27 17:18:40 |
39 | [ssh_config.5] | 39 | [ssh_config.5] |
40 | some warning text for ForwardAgent and ForwardX11; ok markus@ | 40 | some warning text for ForwardAgent and ForwardX11; ok markus@ |
41 | - stevesk@cvs.openbsd.org 2002/08/29 15:57:25 | ||
42 | [monitor.c session.c sshlogin.c sshlogin.h] | ||
43 | pass addrlen with sockaddr *; from Hajimu UMEMOTO <ume@FreeBSD.org> | ||
44 | NOTE: there are also p-specific parts to this patch. ok markus@ | ||
41 | 45 | ||
42 | 20020820 | 46 | 20020820 |
43 | - OpenBSD CVS Sync | 47 | - OpenBSD CVS Sync |
@@ -1579,4 +1583,4 @@ | |||
1579 | - (stevesk) entropy.c: typo in debug message | 1583 | - (stevesk) entropy.c: typo in debug message |
1580 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1584 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1581 | 1585 | ||
1582 | $Id: ChangeLog,v 1.2437 2002/09/04 06:40:37 djm Exp $ | 1586 | $Id: ChangeLog,v 1.2438 2002/09/04 06:45:09 djm Exp $ |
@@ -25,7 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | RCSID("$OpenBSD: monitor.c,v 1.23 2002/08/02 14:43:15 millert Exp $"); | 28 | RCSID("$OpenBSD: monitor.c,v 1.24 2002/08/29 15:57:25 stevesk Exp $"); |
29 | 29 | ||
30 | #include <openssl/dh.h> | 30 | #include <openssl/dh.h> |
31 | 31 | ||
@@ -1002,8 +1002,8 @@ mm_record_login(Session *s, struct passwd *pw) | |||
1002 | * the address be 0.0.0.0. | 1002 | * the address be 0.0.0.0. |
1003 | */ | 1003 | */ |
1004 | memset(&from, 0, sizeof(from)); | 1004 | memset(&from, 0, sizeof(from)); |
1005 | fromlen = sizeof(from); | ||
1005 | if (packet_connection_is_on_socket()) { | 1006 | if (packet_connection_is_on_socket()) { |
1006 | fromlen = sizeof(from); | ||
1007 | if (getpeername(packet_get_connection_in(), | 1007 | if (getpeername(packet_get_connection_in(), |
1008 | (struct sockaddr *) & from, &fromlen) < 0) { | 1008 | (struct sockaddr *) & from, &fromlen) < 0) { |
1009 | debug("getpeername: %.100s", strerror(errno)); | 1009 | debug("getpeername: %.100s", strerror(errno)); |
@@ -1013,7 +1013,7 @@ mm_record_login(Session *s, struct passwd *pw) | |||
1013 | /* Record that there was a login on that tty from the remote host. */ | 1013 | /* Record that there was a login on that tty from the remote host. */ |
1014 | record_login(s->pid, s->tty, pw->pw_name, pw->pw_uid, | 1014 | record_login(s->pid, s->tty, pw->pw_name, pw->pw_uid, |
1015 | get_remote_name_or_ip(utmp_len, options.verify_reverse_mapping), | 1015 | get_remote_name_or_ip(utmp_len, options.verify_reverse_mapping), |
1016 | (struct sockaddr *)&from); | 1016 | (struct sockaddr *)&from, fromlen); |
1017 | } | 1017 | } |
1018 | 1018 | ||
1019 | static void | 1019 | static void |
@@ -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 | /* |
diff --git a/sshlogin.c b/sshlogin.c index e76f94534..4cd1c0059 100644 --- a/sshlogin.c +++ b/sshlogin.c | |||
@@ -39,7 +39,7 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: sshlogin.c,v 1.4 2002/06/23 03:30:17 deraadt Exp $"); | 42 | RCSID("$OpenBSD: sshlogin.c,v 1.5 2002/08/29 15:57:25 stevesk Exp $"); |
43 | 43 | ||
44 | #include "loginrec.h" | 44 | #include "loginrec.h" |
45 | 45 | ||
@@ -65,7 +65,7 @@ get_last_login_time(uid_t uid, const char *logname, | |||
65 | */ | 65 | */ |
66 | void | 66 | void |
67 | record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid, | 67 | record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid, |
68 | const char *host, struct sockaddr * addr) | 68 | const char *host, struct sockaddr * addr, socklen_t addrlen) |
69 | { | 69 | { |
70 | struct logininfo *li; | 70 | struct logininfo *li; |
71 | 71 | ||
diff --git a/sshlogin.h b/sshlogin.h index bd30278e0..287c0d9f6 100644 --- a/sshlogin.h +++ b/sshlogin.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshlogin.h,v 1.3 2001/06/26 17:27:25 markus Exp $ */ | 1 | /* $OpenBSD: sshlogin.h,v 1.4 2002/08/29 15:57:25 stevesk Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | void | 17 | void |
18 | record_login(pid_t, const char *, const char *, uid_t, | 18 | record_login(pid_t, const char *, const char *, uid_t, |
19 | const char *, struct sockaddr *); | 19 | const char *, struct sockaddr *, socklen_t); |
20 | void record_logout(pid_t, const char *, const char *); | 20 | void record_logout(pid_t, const char *, const char *); |
21 | u_long get_last_login_time(uid_t, const char *, char *, u_int); | 21 | u_long get_last_login_time(uid_t, const char *, char *, u_int); |
22 | 22 | ||