tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 07:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[ssh.c]
     remove unused cruft.
This commit is contained in:
Ben Lindstrom 2002-06-12 16:09:39 +00:00
parent 1aa6427c0f
commit 2415757253
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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 20020611
- (bal) ssh-agent.c RCSD fix (|unexpand already done) - (bal) ssh-agent.c RCSD fix (|unexpand already done)
- (bal) OpenBSD CVS Sync - (bal) OpenBSD CVS Sync
@ -909,4 +915,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (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 $

16
ssh.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #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/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
@ -210,7 +210,7 @@ static void load_public_identity_files(void);
int int
main(int ac, char **av) main(int ac, char **av)
{ {
int i, opt, exit_status, cerr; int i, opt, exit_status;
u_short fwd_port, fwd_host_port; u_short fwd_port, fwd_host_port;
char sfwd_port[6], sfwd_host_port[6]; char sfwd_port[6], sfwd_host_port[6];
char *p, *cp, buf[256]; char *p, *cp, buf[256];
@ -613,14 +613,15 @@ again:
} }
/* Open a connection to the remote host. */ /* 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, options.connection_attempts,
#ifdef HAVE_CYGWIN #ifdef HAVE_CYGWIN
options.use_privileged_port, options.use_privileged_port,
#else #else
original_effective_uid == 0 && options.use_privileged_port, original_effective_uid == 0 && options.use_privileged_port,
#endif #endif
options.proxy_command); options.proxy_command) < 0)
exit(1);
/* /*
* If we successfully made the connection, load the host private key * If we successfully made the connection, load the host private key
@ -633,8 +634,8 @@ again:
sensitive_data.nkeys = 0; sensitive_data.nkeys = 0;
sensitive_data.keys = NULL; sensitive_data.keys = NULL;
sensitive_data.external_keysign = 0; sensitive_data.external_keysign = 0;
if (!cerr && (options.rhosts_rsa_authentication || if (options.rhosts_rsa_authentication ||
options.hostbased_authentication)) { options.hostbased_authentication) {
sensitive_data.nkeys = 3; sensitive_data.nkeys = 3;
sensitive_data.keys = xmalloc(sensitive_data.nkeys*sizeof(Key)); sensitive_data.keys = xmalloc(sensitive_data.nkeys*sizeof(Key));
@ -676,9 +677,6 @@ again:
if (mkdir(buf, 0700) < 0) if (mkdir(buf, 0700) < 0)
error("Could not create directory '%.200s'.", buf); error("Could not create directory '%.200s'.", buf);
if (cerr)
exit(1);
/* load options.identity_files */ /* load options.identity_files */
load_public_identity_files(); load_public_identity_files();