diff options
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sshconnect.c b/sshconnect.c index 369b31dfe..651e3fcf4 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.122 2002/06/09 04:33:27 markus Exp $"); | 16 | RCSID("$OpenBSD: sshconnect.c,v 1.123 2002/06/09 22:17:21 itojun Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | 19 | ||
@@ -44,11 +44,11 @@ extern char *__progname; | |||
44 | #endif | 44 | #endif |
45 | 45 | ||
46 | static const char * | 46 | static const char * |
47 | sockaddr_ntop(struct sockaddr *sa) | 47 | sockaddr_ntop(struct sockaddr *sa, socklen_t salen) |
48 | { | 48 | { |
49 | static char addrbuf[NI_MAXHOST]; | 49 | static char addrbuf[NI_MAXHOST]; |
50 | 50 | ||
51 | if (getnameinfo(sa, sa->sa_len, addrbuf, sizeof(addrbuf), NULL, 0, | 51 | if (getnameinfo(sa, salen, addrbuf, sizeof(addrbuf), NULL, 0, |
52 | NI_NUMERICHOST) != 0) | 52 | NI_NUMERICHOST) != 0) |
53 | fatal("sockaddr_ntop: getnameinfo NI_NUMERICHOST failed"); | 53 | fatal("sockaddr_ntop: getnameinfo NI_NUMERICHOST failed"); |
54 | return addrbuf; | 54 | return addrbuf; |
@@ -322,8 +322,8 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, | |||
322 | if (errno == ECONNREFUSED) | 322 | if (errno == ECONNREFUSED) |
323 | full_failure = 0; | 323 | full_failure = 0; |
324 | log("ssh: connect to address %s port %s: %s", | 324 | log("ssh: connect to address %s port %s: %s", |
325 | sockaddr_ntop(ai->ai_addr), strport, | 325 | sockaddr_ntop(ai->ai_addr, ai->ai_addrlen), |
326 | strerror(errno)); | 326 | strport, strerror(errno)); |
327 | restore_uid(); | 327 | restore_uid(); |
328 | /* | 328 | /* |
329 | * Close the failed socket; there appear to | 329 | * Close the failed socket; there appear to |