- markus@cvs.openbsd.org 2005/01/05 08:51:32

[openssh.git] / sshconnect.c

diff --git a/sshconnect.c b/sshconnect.c
index dfeddd39eec51b02c65a5db9629eeb5e1484c12f..33ec4753a9e472b7f595b21fb429302acd68b552 100644 (file)
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.156 2004/01/25 03:49:09 djm Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.159 2005/01/05 08:51:32 markus Exp $");
 
 #include <openssl/bn.h>
 
@@ -31,7 +31,6 @@ RCSID("$OpenBSD: sshconnect.c,v 1.156 2004/01/25 03:49:09 djm Exp $");
 #include "readconf.h"
 #include "atomicio.h"
 #include "misc.h"
-#include "readpass.h"
 
 #include "dns.h"
 
@@ -298,12 +297,6 @@ timeout_connect(int sockfd, const struct sockaddr *serv_addr,
  * second).  If proxy_command is non-NULL, it specifies the command (with %h
  * and %p substituted for host and port, respectively) to use to contact
  * the daemon.
- * Return values:
- *    0 for OK
- *    ECONNREFUSED if we got a "Connection Refused" by the peer on any address
- *    ECONNABORTED if we failed without a "Connection refused"
- * Suitable error messages for the connection failure will already have been
- * printed.
  */
 int
 ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
@@ -316,12 +309,6 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
        char ntop[NI_MAXHOST], strport[NI_MAXSERV];
        struct addrinfo hints, *ai, *aitop;
        struct servent *sp;
-       /*
-        * Did we get only other errors than "Connection refused" (which
-        * should block fallback to rsh and similar), or did we get at least
-        * one "Connection refused"?
-        */
-       int full_failure = 1;
 
        debug2("ssh_connect: needpriv %d", needpriv);
 
@@ -382,8 +369,6 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
                                memcpy(hostaddr, ai->ai_addr, ai->ai_addrlen);
                                break;
                        } else {
-                               if (errno == ECONNREFUSED)
-                                       full_failure = 0;
                                debug("connect to address %s port %s: %s",
                                    ntop, strport, strerror(errno));
                                /*
@@ -409,9 +394,9 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
 
        /* Return failure if we didn't get a successful connection. */
        if (attempt >= connection_attempts) {
-               logit("ssh: connect to host %s port %s: %s",
+               error("ssh: connect to host %s port %s: %s",
                    host, strport, strerror(errno));
-               return full_failure ? ECONNABORTED : ECONNREFUSED;
+               return (-1);
        }
 
        debug("Connection established.");
@@ -768,19 +753,19 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
                break;
        case HOST_CHANGED:
                if (options.check_host_ip && host_ip_differ) {
-                       char *msg;
+                       char *key_msg;
                        if (ip_status == HOST_NEW)
-                               msg = "is unknown";
+                               key_msg = "is unknown";
                        else if (ip_status == HOST_OK)
-                               msg = "is unchanged";
+                               key_msg = "is unchanged";
                        else
-                               msg = "has a different value";
+                               key_msg = "has a different value";
                        error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
                        error("@       WARNING: POSSIBLE DNS SPOOFING DETECTED!          @");
                        error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
                        error("The %s host key for %s has changed,", type, host);
                        error("and the key for the according IP address %s", ip);
-                       error("%s. This could either mean that", msg);
+                       error("%s. This could either mean that", key_msg);
                        error("DNS SPOOFING is happening or the IP address for the host");
                        error("and its host key have changed at the same time.");
                        if (ip_status != HOST_NEW)