summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-07-11 03:54:43 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-07-11 03:54:43 +0000
commitefee05958cc5ef649fde971a307b70eee2941871 (patch)
tree8d132d0ec3be3411ad610762e62964379e3d0060
parent6827395b07f8a74161ba12fa82b0a7617cad27ba (diff)
- itojun@cvs.openbsd.org 2002/07/09 11:56:50
[sshconnect.c] silently try next address on connect(2). markus ok
-rw-r--r--ChangeLog6
-rw-r--r--sshconnect.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 52aafe15..8d06e07c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
20020710
- (tim) [contrib/cygwin/ssh-host-config] explicitely sets the permissions
on /var/empty to 755 Patch by vinschen@redhat.com
+ - (bal) OpenBSD CVS Sync
+ - itojun@cvs.openbsd.org 2002/07/09 11:56:50
+ [sshconnect.c]
+ silently try next address on connect(2). markus ok
20020709
- (bal) NO_IPPORT_RESERVED_CONCEPT used instead of CYGWIN so other platforms
@@ -1324,4 +1328,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
-$Id: ChangeLog,v 1.2353 2002/07/10 14:40:11 tim Exp $
+$Id: ChangeLog,v 1.2354 2002/07/11 03:54:43 mouring Exp $
diff --git a/sshconnect.c b/sshconnect.c
index 32e57296..f4301be3 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.127 2002/06/27 08:49:44 markus Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.128 2002/07/09 11:56:50 itojun Exp $");
#include <openssl/bn.h>
@@ -307,9 +307,11 @@ 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