summaryrefslogtreecommitdiff
path: root/sshconnect.c
diff options
context:
space:
mode:
Diffstat (limited to 'sshconnect.c')
-rw-r--r--sshconnect.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/sshconnect.c b/sshconnect.c
index ba5deb441..ae6c5f32b 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
13 */ 13 */
14 14
15#include "includes.h" 15#include "includes.h"
16RCSID("$OpenBSD: sshconnect.c,v 1.129 2002/07/09 12:04:02 itojun Exp $"); 16RCSID("$OpenBSD: sshconnect.c,v 1.130 2002/07/10 10:28:15 itojun Exp $");
17 17
18#include <openssl/bn.h> 18#include <openssl/bn.h>
19 19
@@ -309,11 +309,6 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
309 } else { 309 } else {
310 if (errno == ECONNREFUSED) 310 if (errno == ECONNREFUSED)
311 full_failure = 0; 311 full_failure = 0;
312#if 0
313 log("ssh: connect to address %s port %s: %s",
314 sockaddr_ntop(ai->ai_addr, ai->ai_addrlen),
315 strport, strerror(errno));
316#endif
317 /* 312 /*
318 * Close the failed socket; there appear to 313 * Close the failed socket; there appear to
319 * be some problems when reusing a socket for 314 * be some problems when reusing a socket for
@@ -336,8 +331,11 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
336 freeaddrinfo(aitop); 331 freeaddrinfo(aitop);
337 332
338 /* Return failure if we didn't get a successful connection. */ 333 /* Return failure if we didn't get a successful connection. */
339 if (attempt >= connection_attempts) 334 if (attempt >= connection_attempts) {
335 log("ssh: connect to host %s port %s: %s",
336 host, strport, strerror(errno));
340 return full_failure ? ECONNABORTED : ECONNREFUSED; 337 return full_failure ? ECONNABORTED : ECONNREFUSED;
338 }
341 339
342 debug("Connection established."); 340 debug("Connection established.");
343 341