diff options
author | kris <kris@FreeBSD.org> | 2000-03-26 07:07:24 +0000 |
---|---|---|
committer | kris <kris@FreeBSD.org> | 2000-03-26 07:07:24 +0000 |
commit | b201b15ee1575ab28ed4f9b5a7d430e835a7c7ae (patch) | |
tree | 561c850bc04e7b62c9fc641be89ac412589219c1 /crypto/openssh/ssh.c | |
parent | fc557ff7d97438559e69347575f5aa8ef03a5f50 (diff) | |
download | FreeBSD-src-b201b15ee1575ab28ed4f9b5a7d430e835a7c7ae.zip FreeBSD-src-b201b15ee1575ab28ed4f9b5a7d430e835a7c7ae.tar.gz |
Virgin import of OpenSSH sources dated 2000/03/25
Diffstat (limited to 'crypto/openssh/ssh.c')
-rw-r--r-- | crypto/openssh/ssh.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crypto/openssh/ssh.c b/crypto/openssh/ssh.c index f42fcb6..c5652ea 100644 --- a/crypto/openssh/ssh.c +++ b/crypto/openssh/ssh.c @@ -11,7 +11,7 @@ */ #include "includes.h" -RCSID("$Id: ssh.c,v 1.40 2000/02/20 20:05:19 markus Exp $"); +RCSID("$Id: ssh.c,v 1.43 2000/03/23 21:52:02 markus Exp $"); #include "xmalloc.h" #include "ssh.h" @@ -93,6 +93,7 @@ usage() fprintf(stderr, " -k Disable Kerberos ticket and AFS token forwarding.\n"); #endif /* AFS */ fprintf(stderr, " -x Disable X11 connection forwarding.\n"); + fprintf(stderr, " -X Enable X11 connection forwarding.\n"); fprintf(stderr, " -i file Identity for RSA authentication (default: ~/.ssh/identity).\n"); fprintf(stderr, " -t Tty; allocate a tty even if command is given.\n"); fprintf(stderr, " -v Verbose; display verbose debugging messages.\n"); @@ -170,6 +171,7 @@ main(int ac, char **av) struct stat st; struct passwd *pw, pwcopy; int interactive = 0, dummy; + int have_pty = 0; uid_t original_effective_uid; int plen; @@ -609,9 +611,6 @@ main(int ac, char **av) if (host_private_key_loaded) RSA_free(host_private_key); /* Destroys contents safely */ - /* Close connection cleanly after attack. */ - cipher_attack_detected = packet_disconnect; - /* Enable compression if requested. */ if (options.compression) { debug("Requesting compression at level %d.", options.compression_level); @@ -663,9 +662,10 @@ main(int ac, char **av) /* Read response from the server. */ type = packet_read(&plen); - if (type == SSH_SMSG_SUCCESS) + if (type == SSH_SMSG_SUCCESS) { interactive = 1; - else if (type == SSH_SMSG_FAILURE) + have_pty = 1; + } else if (type == SSH_SMSG_FAILURE) log("Warning: Remote host failed or refused to allocate a pseudo tty."); else packet_disconnect("Protocol error waiting for pty request response."); @@ -793,7 +793,7 @@ main(int ac, char **av) } /* Enter the interactive session. */ - exit_status = client_loop(tty_flag, tty_flag ? options.escape_char : -1); + exit_status = client_loop(have_pty, tty_flag ? options.escape_char : -1); /* Close the connection to the remote host. */ packet_close(); |