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 52aafe15f..8d06e07c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
120020710 120020710
2 - (tim) [contrib/cygwin/ssh-host-config] explicitely sets the permissions 2 - (tim) [contrib/cygwin/ssh-host-config] explicitely sets the permissions
3 on /var/empty to 755 Patch by vinschen@redhat.com 3 on /var/empty to 755 Patch by vinschen@redhat.com
4 - (bal) OpenBSD CVS Sync
5 - itojun@cvs.openbsd.org 2002/07/09 11:56:50
6 [sshconnect.c]
7 silently try next address on connect(2). markus ok
4 8
520020709 920020709
6 - (bal) NO_IPPORT_RESERVED_CONCEPT used instead of CYGWIN so other platforms 10 - (bal) NO_IPPORT_RESERVED_CONCEPT used instead of CYGWIN so other platforms
@@ -1324,4 +1328,4 @@
1324 - (stevesk) entropy.c: typo in debug message 1328 - (stevesk) entropy.c: typo in debug message
1325 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1329 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1326 1330
1327$Id: ChangeLog,v 1.2353 2002/07/10 14:40:11 tim Exp $ 1331$Id: ChangeLog,v 1.2354 2002/07/11 03:54:43 mouring Exp $
diff --git a/sshconnect.c b/sshconnect.c
index 32e57296e..f4301be39 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.127 2002/06/27 08:49:44 markus Exp $"); 16RCSID("$OpenBSD: sshconnect.c,v 1.128 2002/07/09 11:56:50 itojun Exp $");
17 17
18#include <openssl/bn.h> 18#include <openssl/bn.h>
19 19
@@ -307,9 +307,11 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
307 } else { 307 } else {
308 if (errno == ECONNREFUSED) 308 if (errno == ECONNREFUSED)
309 full_failure = 0; 309 full_failure = 0;
310#if 0
310 log("ssh: connect to address %s port %s: %s", 311 log("ssh: connect to address %s port %s: %s",
311 sockaddr_ntop(ai->ai_addr, ai->ai_addrlen), 312 sockaddr_ntop(ai->ai_addr, ai->ai_addrlen),
312 strport, strerror(errno)); 313 strport, strerror(errno));
314#endif
313 /* 315 /*
314 * Close the failed socket; there appear to 316 * Close the failed socket; there appear to
315 * be some problems when reusing a socket for 317 * be some problems when reusing a socket for