diff options
| -rw-r--r-- | crypto/openssh/readconf.c | 4 | ||||
| -rw-r--r-- | crypto/openssh/ssh.1 | 5 | ||||
| -rw-r--r-- | crypto/openssh/ssh.c | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index f44ee558845a..8dd81cfe3939 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -15,7 +15,7 @@ */ #include "includes.h" -RCSID("$Id: readconf.c,v 1.22 1999/12/01 13:59:15 markus Exp $"); +RCSID("$Id: readconf.c,v 1.23 2000/02/28 19:51:58 markus Exp $"); #include "ssh.h" #include "cipher.h" @@ -660,7 +660,7 @@ fill_default_options(Options * options) if (options->forward_agent == -1) options->forward_agent = 1; if (options->forward_x11 == -1) - options->forward_x11 = 1; + options->forward_x11 = 0; if (options->gateway_ports == -1) options->gateway_ports = 0; if (options->use_privileged_port == -1) diff --git a/crypto/openssh/ssh.1 b/crypto/openssh/ssh.1 index 9851702e0b9c..6c8f7090c291 100644 --- a/crypto/openssh/ssh.1 +++ b/crypto/openssh/ssh.1 @@ -9,7 +9,8 @@ .\" .\" Created: Sat Apr 22 21:55:14 1995 ylo .\" -.\" $Id: ssh.1,v 1.37 2000/02/21 14:19:09 deraadt Exp $ +.\" $Id: ssh.1,v 1.38 2000/02/28 19:51:58 markus Exp $ +.\" $FreeBSD$ .\" .Dd September 25, 1999 .Dt SSH 1 @@ -557,6 +558,8 @@ set. The argument must be .Dq yes or .Dq no . +The default is +.Dq no . .It Cm GatewayPorts Specifies whether remote hosts are allowed to connect to local forwarded ports. diff --git a/crypto/openssh/ssh.c b/crypto/openssh/ssh.c index e24003646e92..cfaab2573c19 100644 --- a/crypto/openssh/ssh.c +++ b/crypto/openssh/ssh.c @@ -13,7 +13,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.41 2000/02/28 19:51:58 markus Exp $"); #include "xmalloc.h" #include "ssh.h" @@ -95,6 +95,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"); |