- markus@cvs.openbsd.org 2002/06/11 23:03:54

     [ssh.c]
     remove unused cruft.

diff --git a/ChangeLog b/ChangeLog
index b7dc4bda0ef31a4cf4bce81b18e11eff99c081b4..a875c8e0112a979bbae053ebfdf8cb5e49f3a6a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20020612
+ - (bal) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2002/06/11 23:03:54
+     [ssh.c]
+     remove unused cruft.
+
 20020611
  - (bal) ssh-agent.c RCSD fix (|unexpand already done)
  - (bal) OpenBSD CVS Sync

diff --git a/ssh.c b/ssh.c
index be9c78b0fc28f1fa865ea4ac4d335f50a26c2949..06549afde61a8e58ccec3a3e394b2f2f426f9fac 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.177 2002/06/11 04:14:26 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.178 2002/06/11 23:03:54 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -210,7 +210,7 @@ static void load_public_identity_files(void);
 int
 main(int ac, char **av)
 {
-       int i, opt, exit_status, cerr;
+       int i, opt, exit_status;
        u_short fwd_port, fwd_host_port;
        char sfwd_port[6], sfwd_host_port[6];
        char *p, *cp, buf[256];
@@ -613,14 +613,15 @@ again:
        }
        /* Open a connection to the remote host. */
 
-       cerr = ssh_connect(host, &hostaddr, options.port, IPv4or6,
+       if (ssh_connect(host, &hostaddr, options.port, IPv4or6,
            options.connection_attempts,
 #ifdef HAVE_CYGWIN
            options.use_privileged_port,
 #else
            original_effective_uid == 0 && options.use_privileged_port,
 #endif
-           options.proxy_command);
+           options.proxy_command) < 0)
+               exit(1);
 
        /*
         * If we successfully made the connection, load the host private key
@@ -633,8 +634,8 @@ again:
        sensitive_data.nkeys = 0;
        sensitive_data.keys = NULL;
        sensitive_data.external_keysign = 0;
-       if (!cerr && (options.rhosts_rsa_authentication ||
-           options.hostbased_authentication)) {
+       if (options.rhosts_rsa_authentication ||
+           options.hostbased_authentication) {
                sensitive_data.nkeys = 3;
                sensitive_data.keys = xmalloc(sensitive_data.nkeys*sizeof(Key));
 
@@ -676,9 +677,6 @@ again:
                if (mkdir(buf, 0700) < 0)
                        error("Could not create directory '%.200s'.", buf);
 
-       if (cerr)
-               exit(1);
-
        /* load options.identity_files */
        load_public_identity_files();