diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sshconnect.c | 18 |
2 files changed, 8 insertions, 15 deletions
@@ -22,6 +22,9 @@ | |||
22 | [readconf.c] | 22 | [readconf.c] |
23 | silently ignore deprecated options, since FallBackToRsh might be passed | 23 | silently ignore deprecated options, since FallBackToRsh might be passed |
24 | by remote scp commands. | 24 | by remote scp commands. |
25 | - itojun@cvs.openbsd.org 2002/06/08 21:15:27 | ||
26 | [sshconnect.c] | ||
27 | always use getnameinfo. (diag message only) | ||
25 | 28 | ||
26 | 20020607 | 29 | 20020607 |
27 | - (bal) Removed --{enable/disable}-suid-ssh | 30 | - (bal) Removed --{enable/disable}-suid-ssh |
@@ -853,4 +856,4 @@ | |||
853 | - (stevesk) entropy.c: typo in debug message | 856 | - (stevesk) entropy.c: typo in debug message |
854 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 857 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
855 | 858 | ||
856 | $Id: ChangeLog,v 1.2195 2002/06/09 20:13:27 mouring Exp $ | 859 | $Id: ChangeLog,v 1.2196 2002/06/09 20:14:54 mouring Exp $ |
diff --git a/sshconnect.c b/sshconnect.c index 7af0b9a80..9444e3cf2 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "includes.h" | 15 | #include "includes.h" |
16 | RCSID("$OpenBSD: sshconnect.c,v 1.120 2002/05/23 19:24:30 markus Exp $"); | 16 | RCSID("$OpenBSD: sshconnect.c,v 1.121 2002/06/08 21:15:27 itojun Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | 19 | ||
@@ -46,21 +46,11 @@ extern char *__progname; | |||
46 | static const char * | 46 | static const char * |
47 | sockaddr_ntop(struct sockaddr *sa) | 47 | sockaddr_ntop(struct sockaddr *sa) |
48 | { | 48 | { |
49 | void *addr; | 49 | static char addrbuf[NI_MAXHOST]; |
50 | static char addrbuf[INET6_ADDRSTRLEN]; | ||
51 | 50 | ||
52 | switch (sa->sa_family) { | 51 | if (getnameinfo(sa, sa->sa_len, addrbuf, sizeof(addrbuf), NULL, 0, |
53 | case AF_INET: | 52 | NI_NUMERICHOST) != 0) |
54 | addr = &((struct sockaddr_in *)sa)->sin_addr; | ||
55 | break; | ||
56 | case AF_INET6: | ||
57 | addr = &((struct sockaddr_in6 *)sa)->sin6_addr; | ||
58 | break; | ||
59 | default: | ||
60 | /* This case should be protected against elsewhere */ | ||
61 | abort(); /* XXX abort is bad -- do something else */ | 53 | abort(); /* XXX abort is bad -- do something else */ |
62 | } | ||
63 | inet_ntop(sa->sa_family, addr, addrbuf, sizeof(addrbuf)); | ||
64 | return addrbuf; | 54 | return addrbuf; |
65 | } | 55 | } |
66 | 56 | ||