diff options
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/sshconnect.c b/sshconnect.c index ae6c5f32b..9f8458dc7 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.130 2002/07/10 10:28:15 itojun Exp $"); | 16 | RCSID("$OpenBSD: sshconnect.c,v 1.131 2002/07/12 13:29:09 itojun Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | 19 | ||
@@ -46,19 +46,6 @@ extern uid_t original_effective_uid; | |||
46 | #define INET6_ADDRSTRLEN 46 | 46 | #define INET6_ADDRSTRLEN 46 |
47 | #endif | 47 | #endif |
48 | 48 | ||
49 | #if 0 | ||
50 | static const char * | ||
51 | sockaddr_ntop(struct sockaddr *sa, socklen_t salen) | ||
52 | { | ||
53 | static char addrbuf[NI_MAXHOST]; | ||
54 | |||
55 | if (getnameinfo(sa, salen, addrbuf, sizeof(addrbuf), NULL, 0, | ||
56 | NI_NUMERICHOST) != 0) | ||
57 | fatal("sockaddr_ntop: getnameinfo NI_NUMERICHOST failed"); | ||
58 | return addrbuf; | ||
59 | } | ||
60 | #endif | ||
61 | |||
62 | /* | 49 | /* |
63 | * Connect to the given ssh server using a proxy command. | 50 | * Connect to the given ssh server using a proxy command. |
64 | */ | 51 | */ |
@@ -309,6 +296,8 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, | |||
309 | } else { | 296 | } else { |
310 | if (errno == ECONNREFUSED) | 297 | if (errno == ECONNREFUSED) |
311 | full_failure = 0; | 298 | full_failure = 0; |
299 | debug("connect to address %s port %s: %s", | ||
300 | ntop, strport, strerror(errno)); | ||
312 | /* | 301 | /* |
313 | * Close the failed socket; there appear to | 302 | * Close the failed socket; there appear to |
314 | * be some problems when reusing a socket for | 303 | * be some problems when reusing a socket for |