diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-06-12 16:09:39 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-06-12 16:09:39 +0000 |
commit | 2415757253b34b747eecf2f94498b72ca7b331c5 (patch) | |
tree | 4cd67c1fc81d8e26a2aca093b417006932b10542 | |
parent | 1aa6427c0f0385fde48e3457a9ebf37b8de77d06 (diff) |
- markus@cvs.openbsd.org 2002/06/11 23:03:54
[ssh.c]
remove unused cruft.
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | ssh.c | 16 |
2 files changed, 14 insertions, 10 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20020612 | ||
2 | - (bal) OpenBSD CVS Sync | ||
3 | - markus@cvs.openbsd.org 2002/06/11 23:03:54 | ||
4 | [ssh.c] | ||
5 | remove unused cruft. | ||
6 | |||
1 | 20020611 | 7 | 20020611 |
2 | - (bal) ssh-agent.c RCSD fix (|unexpand already done) | 8 | - (bal) ssh-agent.c RCSD fix (|unexpand already done) |
3 | - (bal) OpenBSD CVS Sync | 9 | - (bal) OpenBSD CVS Sync |
@@ -909,4 +915,4 @@ | |||
909 | - (stevesk) entropy.c: typo in debug message | 915 | - (stevesk) entropy.c: typo in debug message |
910 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 916 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
911 | 917 | ||
912 | $Id: ChangeLog,v 1.2211 2002/06/11 20:28:05 mouring Exp $ | 918 | $Id: ChangeLog,v 1.2212 2002/06/12 16:09:39 mouring Exp $ |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.177 2002/06/11 04:14:26 markus Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.178 2002/06/11 23:03:54 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -210,7 +210,7 @@ static void load_public_identity_files(void); | |||
210 | int | 210 | int |
211 | main(int ac, char **av) | 211 | main(int ac, char **av) |
212 | { | 212 | { |
213 | int i, opt, exit_status, cerr; | 213 | int i, opt, exit_status; |
214 | u_short fwd_port, fwd_host_port; | 214 | u_short fwd_port, fwd_host_port; |
215 | char sfwd_port[6], sfwd_host_port[6]; | 215 | char sfwd_port[6], sfwd_host_port[6]; |
216 | char *p, *cp, buf[256]; | 216 | char *p, *cp, buf[256]; |
@@ -613,14 +613,15 @@ again: | |||
613 | } | 613 | } |
614 | /* Open a connection to the remote host. */ | 614 | /* Open a connection to the remote host. */ |
615 | 615 | ||
616 | cerr = ssh_connect(host, &hostaddr, options.port, IPv4or6, | 616 | if (ssh_connect(host, &hostaddr, options.port, IPv4or6, |
617 | options.connection_attempts, | 617 | options.connection_attempts, |
618 | #ifdef HAVE_CYGWIN | 618 | #ifdef HAVE_CYGWIN |
619 | options.use_privileged_port, | 619 | options.use_privileged_port, |
620 | #else | 620 | #else |
621 | original_effective_uid == 0 && options.use_privileged_port, | 621 | original_effective_uid == 0 && options.use_privileged_port, |
622 | #endif | 622 | #endif |
623 | options.proxy_command); | 623 | options.proxy_command) < 0) |
624 | exit(1); | ||
624 | 625 | ||
625 | /* | 626 | /* |
626 | * If we successfully made the connection, load the host private key | 627 | * If we successfully made the connection, load the host private key |
@@ -633,8 +634,8 @@ again: | |||
633 | sensitive_data.nkeys = 0; | 634 | sensitive_data.nkeys = 0; |
634 | sensitive_data.keys = NULL; | 635 | sensitive_data.keys = NULL; |
635 | sensitive_data.external_keysign = 0; | 636 | sensitive_data.external_keysign = 0; |
636 | if (!cerr && (options.rhosts_rsa_authentication || | 637 | if (options.rhosts_rsa_authentication || |
637 | options.hostbased_authentication)) { | 638 | options.hostbased_authentication) { |
638 | sensitive_data.nkeys = 3; | 639 | sensitive_data.nkeys = 3; |
639 | sensitive_data.keys = xmalloc(sensitive_data.nkeys*sizeof(Key)); | 640 | sensitive_data.keys = xmalloc(sensitive_data.nkeys*sizeof(Key)); |
640 | 641 | ||
@@ -676,9 +677,6 @@ again: | |||
676 | if (mkdir(buf, 0700) < 0) | 677 | if (mkdir(buf, 0700) < 0) |
677 | error("Could not create directory '%.200s'.", buf); | 678 | error("Could not create directory '%.200s'.", buf); |
678 | 679 | ||
679 | if (cerr) | ||
680 | exit(1); | ||
681 | |||
682 | /* load options.identity_files */ | 680 | /* load options.identity_files */ |
683 | load_public_identity_files(); | 681 | load_public_identity_files(); |
684 | 682 | ||