From a6cd75c49ed90186bb400c08b8878c2c711b9f58 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Thu, 11 Jul 2002 04:00:19 +0000 Subject: - itojun@cvs.openbsd.org 2002/07/10 10:28:15 [sshconnect.c] bark if all connection attempt fails. --- ChangeLog | 5 ++++- sshconnect.c | 12 +++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index a2dc37ccb..b869756c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,9 @@ - stevesk@cvs.openbsd.org 2002/07/09 17:46:25 [sshd_config.5] clarify no preference ordering in protocol list; ok markus@ + - itojun@cvs.openbsd.org 2002/07/10 10:28:15 + [sshconnect.c] + bark if all connection attempt fails. 20020709 - (bal) NO_IPPORT_RESERVED_CONCEPT used instead of CYGWIN so other platforms @@ -1339,4 +1342,4 @@ - (stevesk) entropy.c: typo in debug message - (djm) ssh-keygen -i needs seeded RNG; report from markus@ -$Id: ChangeLog,v 1.2357 2002/07/11 03:59:18 mouring Exp $ +$Id: ChangeLog,v 1.2358 2002/07/11 04:00:19 mouring Exp $ diff --git a/sshconnect.c b/sshconnect.c index ba5deb441..ae6c5f32b 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -13,7 +13,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect.c,v 1.129 2002/07/09 12:04:02 itojun Exp $"); +RCSID("$OpenBSD: sshconnect.c,v 1.130 2002/07/10 10:28:15 itojun Exp $"); #include @@ -309,11 +309,6 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, } else { if (errno == ECONNREFUSED) full_failure = 0; -#if 0 - log("ssh: connect to address %s port %s: %s", - sockaddr_ntop(ai->ai_addr, ai->ai_addrlen), - strport, strerror(errno)); -#endif /* * Close the failed socket; there appear to * be some problems when reusing a socket for @@ -336,8 +331,11 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, freeaddrinfo(aitop); /* Return failure if we didn't get a successful connection. */ - if (attempt >= connection_attempts) + if (attempt >= connection_attempts) { + log("ssh: connect to host %s port %s: %s", + host, strport, strerror(errno)); return full_failure ? ECONNABORTED : ECONNREFUSED; + } debug("Connection established."); -- cgit v1.2.3