mirror of
https://abf.rosa.ru/djam/openssh.git
synced 2025-02-25 18:53:02 +00:00
63 lines
2.2 KiB
Diff
63 lines
2.2 KiB
Diff
diff -Naur openssh-6.5p1.orig/ssh_config openssh-6.5p1/ssh_config
|
|
--- openssh-6.5p1.orig/ssh_config 2014-02-12 08:11:35.958062587 -0500
|
|
+++ openssh-6.5p1/ssh_config 2014-02-12 08:11:57.327064162 -0500
|
|
@@ -46,3 +46,17 @@
|
|
# VisualHostKey no
|
|
# ProxyCommand ssh -q -W %h:%p gateway.example.com
|
|
# RekeyLimit 1G 1h
|
|
+
|
|
+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
|
|
diff -Naur openssh-6.5p1.orig/sshd_config openssh-6.5p1/sshd_config
|
|
--- openssh-6.5p1.orig/sshd_config 2014-02-12 08:11:35.958062587 -0500
|
|
+++ openssh-6.5p1/sshd_config 2014-02-12 08:11:57.329064162 -0500
|
|
@@ -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
|
|
#HostKey /etc/ssh/ssh_host_ed25519_key
|
|
|
|
@@ -96,10 +97,15 @@
|
|
# 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
|
|
#PermitTTY yes
|