mirror of
https://abf.rosa.ru/djam/openssh.git
synced 2025-02-25 10:43:09 +00:00
78 lines
2.4 KiB
Diff
78 lines
2.4 KiB
Diff
--- openssh-5.7p1/ssh_config.mdv 2010-01-12 06:40:27.000000000 -0200
|
|
+++ openssh-5.7p1/ssh_config 2011-01-29 15:40:38.000000000 -0200
|
|
@@ -45,3 +45,17 @@
|
|
# PermitLocalCommand no
|
|
# VisualHostKey no
|
|
# ProxyCommand ssh -q -W %h:%p gateway.example.com
|
|
+
|
|
+Host *
|
|
+ ForwardX11 yes
|
|
+ Protocol 2,1
|
|
+
|
|
+ # If this option is set to yes then remote X11 clients will have full access
|
|
+ # to the original X11 display. As virtually no X11 client supports the untrusted
|
|
+ # mode correctly we set this to yes.
|
|
+ ForwardX11Trusted yes
|
|
+
|
|
+ # Send locale-related environment variables
|
|
+ #SendEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES
|
|
+ #SendEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT
|
|
+ #SendEnv LC_IDENTIFICATION LC_ALL
|
|
--- openssh-5.7p1/sshd_config.mdv 2010-09-09 22:20:12.000000000 -0300
|
|
+++ openssh-5.7p1/sshd_config 2011-01-29 15:41:11.000000000 -0200
|
|
@@ -3,7 +3,7 @@
|
|
# This is the sshd server system-wide configuration file. See
|
|
# sshd_config(5) for more information.
|
|
|
|
-# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
|
|
+# This sshd was compiled with PATH=_OPENSSH_PATH_
|
|
|
|
# The strategy used for options in the default sshd_config shipped with
|
|
# OpenSSH is to specify options with their default value where
|
|
@@ -20,9 +20,10 @@
|
|
|
|
# HostKey for protocol version 1
|
|
#HostKey /etc/ssh/ssh_host_key
|
|
+HostKey /etc/ssh/ssh_host_key
|
|
# HostKeys for protocol version 2
|
|
-#HostKey /etc/ssh/ssh_host_rsa_key
|
|
-#HostKey /etc/ssh/ssh_host_dsa_key
|
|
+HostKey /etc/ssh/ssh_host_rsa_key
|
|
+HostKey /etc/ssh/ssh_host_dsa_key
|
|
#HostKey /etc/ssh/ssh_host_ecdsa_key
|
|
|
|
# Lifetime and size of ephemeral version 1 server key
|
|
@@ -37,7 +38,7 @@
|
|
# Authentication:
|
|
|
|
#LoginGraceTime 2m
|
|
-#PermitRootLogin yes
|
|
+PermitRootLogin no
|
|
#StrictModes yes
|
|
#MaxAuthTries 6
|
|
#MaxSessions 10
|
|
@@ -84,17 +85,22 @@
|
|
# and ChallengeResponseAuthentication to 'no'.
|
|
#UsePAM no
|
|
|
|
+# Accept locale-related environment variables
|
|
+AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES
|
|
+AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT
|
|
+AcceptEnv LC_IDENTIFICATION LC_ALL
|
|
+
|
|
#AllowAgentForwarding yes
|
|
#AllowTcpForwarding yes
|
|
#GatewayPorts no
|
|
-#X11Forwarding no
|
|
+X11Forwarding yes
|
|
#X11DisplayOffset 10
|
|
#X11UseLocalhost yes
|
|
#PrintMotd yes
|
|
#PrintLastLog yes
|
|
#TCPKeepAlive yes
|
|
#UseLogin no
|
|
-#UsePrivilegeSeparation yes
|
|
+UsePrivilegeSeparation yes
|
|
#PermitUserEnvironment no
|
|
#Compression delayed
|
|
#ClientAliveInterval 0
|