summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-06-12 16:09:39 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-06-12 16:09:39 +0000
commit2415757253b34b747eecf2f94498b72ca7b331c5 (patch)
tree4cd67c1fc81d8e26a2aca093b417006932b10542
parent1aa6427c0f0385fde48e3457a9ebf37b8de77d06 (diff)
- markus@cvs.openbsd.org 2002/06/11 23:03:54
[ssh.c] remove unused cruft.
-rw-r--r--ChangeLog8
-rw-r--r--ssh.c16
2 files changed, 14 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 5cfd887d..c0002a18 100644
--- 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
@@ -909,4 +915,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
-$Id: ChangeLog,v 1.2211 2002/06/11 20:28:05 mouring Exp $
+$Id: ChangeLog,v 1.2212 2002/06/12 16:09:39 mouring Exp $
diff --git a/ssh.c b/ssh.c
index be9c78b0..06549afd 100644
--- 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();