diff options
| author | kris <kris@FreeBSD.org> | 2000-06-03 07:18:09 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-06-03 07:18:09 +0000 |
| commit | e503398156edd9b3ad9ebac248c30f5d5380f379 (patch) | |
| tree | ee1a7d00f7444a5417f2b5cd94a3557ba6197b77 /crypto/openssh/ssh.c | |
| parent | 10badcd8c786a973fe56a5b4fe4ea468245231e8 (diff) | |
| download | FreeBSD-src-e503398156edd9b3ad9ebac248c30f5d5380f379.zip FreeBSD-src-e503398156edd9b3ad9ebac248c30f5d5380f379.tar.gz | |
Import vendor patches: the first is written by
Brian Feldman <green@FreeBSD.org>
* Remove the gratuitous dependency on OpenSSL 0.9.5a (preparation for MFC)
* Disable agent forwarding by default in the client (security risk)
Submitted by: green
Obtained from: OpenBSD
Diffstat (limited to 'crypto/openssh/ssh.c')
| -rw-r--r-- | crypto/openssh/ssh.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/crypto/openssh/ssh.c b/crypto/openssh/ssh.c index 0ab3f9f..f343b41 100644 --- a/crypto/openssh/ssh.c +++ b/crypto/openssh/ssh.c @@ -11,7 +11,7 @@ */ #include "includes.h" -RCSID("$Id: ssh.c,v 1.51 2000/05/08 17:12:15 markus Exp $"); +RCSID("$Id: ssh.c,v 1.54 2000/05/30 17:32:06 markus Exp $"); #include <openssl/evp.h> #include <openssl/dsa.h> @@ -108,10 +108,12 @@ usage() fprintf(stderr, "Options:\n"); fprintf(stderr, " -l user Log in using this user name.\n"); fprintf(stderr, " -n Redirect input from /dev/null.\n"); + fprintf(stderr, " -A Enable authentication agent forwarding.\n"); fprintf(stderr, " -a Disable authentication agent forwarding.\n"); #ifdef AFS fprintf(stderr, " -k Disable Kerberos ticket and AFS token forwarding.\n"); #endif /* AFS */ + fprintf(stderr, " -X Enable X11 connection forwarding.\n"); fprintf(stderr, " -x Disable 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"); @@ -306,6 +308,9 @@ main(int ac, char **av) case 'a': options.forward_agent = 0; break; + case 'A': + options.forward_agent = 1; + break; #ifdef AFS case 'k': options.kerberos_tgt_passing = 0; @@ -422,7 +427,7 @@ main(int ac, char **av) if (!host) usage(); - OpenSSL_add_all_algorithms(); + SSLeay_add_all_algorithms(); /* Initialize the command to execute on remote host. */ buffer_init(&command); |
