- itojun@cvs.openbsd.org 2002/07/09 11:56:50

     [sshconnect.c]
     silently try next address on connect(2).  markus ok

diff --git a/ChangeLog b/ChangeLog
index 52aafe15ffaaf57ecbdccdaf2124884f46754f63..8d06e07c5cf8cbf89cfafb51f020e31e07da829b 100644 (file)
--- 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 32e57296ee6eaf3c909988d0f9d607a5cb4f14c5..f4301be395851e25f62a70d8998af772b06900d6 100644 (file)
--- 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