RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- itojun@cvs.openbsd.org 2002/07/10 10:28:15 

[sshconnect.c]
     bark if all connection attempt fails.
This commit is contained in:
Ben Lindstrom 2002-07-11 04:00:19 +00:00
parent 9c44554a41
commit a6cd75c49e
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -16,6 +16,9 @@
- stevesk@cvs.openbsd.org 2002/07/09 17:46:25 - stevesk@cvs.openbsd.org 2002/07/09 17:46:25
[sshd_config.5] [sshd_config.5]
clarify no preference ordering in protocol list; ok markus@ 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 20020709
- (bal) NO_IPPORT_RESERVED_CONCEPT used instead of CYGWIN so other platforms - (bal) NO_IPPORT_RESERVED_CONCEPT used instead of CYGWIN so other platforms
@ -1339,4 +1342,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (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 $

12
sshconnect.c
View File

@ -13,7 +13,7 @@
*/ */
#include "includes.h" #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 <openssl/bn.h> #include <openssl/bn.h>
@ -309,11 +309,6 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
} else { } else {
if (errno == ECONNREFUSED) if (errno == ECONNREFUSED)
full_failure = 0; 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 * Close the failed socket; there appear to
* be some problems when reusing a socket for * be some problems when reusing a socket for
@ -336,8 +331,11 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
freeaddrinfo(aitop); freeaddrinfo(aitop);
/* Return failure if we didn't get a successful connection. */ /* 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; return full_failure ? ECONNABORTED : ECONNREFUSED;
}
debug("Connection established."); debug("Connection established.");