aboutsummaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorKris Kennaway <kris@FreeBSD.org>2000-09-02 03:49:22 +0000
committerKris Kennaway <kris@FreeBSD.org>2000-09-02 03:49:22 +0000
commit1610cd7fa66f8a388e1e33490f5c807bd5735532 (patch)
tree3c8bb893102a0b15136115fd2ba27b0c09ff7ead /crypto
parent1357c5d3cc972e4354410c150945eda7c2c7c2ce (diff)
downloadsrc-1610cd7fa66f8a388e1e33490f5c807bd5735532.tar.gz
src-1610cd7fa66f8a388e1e33490f5c807bd5735532.zip
Turn on X11Forwarding by default on the server. Any risk is to the client,
where it is already disabled by default. Reminded by: peter
Notes
Notes: svn path=/head/; revision=65357
Diffstat (limited to 'crypto')
-rw-r--r--crypto/openssh/servconf.c2
-rw-r--r--crypto/openssh/sshd_config2
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c
index 8d37e10394c0..49d6607c1a0d 100644
--- a/crypto/openssh/servconf.c
+++ b/crypto/openssh/servconf.c
@@ -113,7 +113,7 @@ fill_default_server_options(ServerOptions *options)
if (options->print_motd == -1)
options->print_motd = 1;
if (options->x11_forwarding == -1)
- options->x11_forwarding = 0;
+ options->x11_forwarding = 1;
if (options->x11_display_offset == -1)
options->x11_display_offset = 10;
if (options->strict_modes == -1)
diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config
index e1fbe8e635aa..ca64fdf6eff5 100644
--- a/crypto/openssh/sshd_config
+++ b/crypto/openssh/sshd_config
@@ -19,7 +19,7 @@ IgnoreRhosts yes
# Uncomment if you don't trust ~/.ssh/known_hosts for RhostsRSAAuthentication
#IgnoreUserKnownHosts yes
StrictModes yes
-X11Forwarding no
+X11Forwarding yes
X11DisplayOffset 10
PrintMotd yes
KeepAlive yes