summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2013-04-30 13:59:17 +0000
committerTiago Gomes <tiago.gomes@codethink.co.uk>2015-02-11 09:40:44 +0000
commit782fe9e725243eeb5ad6ab9a1783b5d6bedfe0d7 (patch)
tree4562475a579b3d1c0531e4ee6715be18907629f4
parent37a2376f3abdf54bde718f0e85a6e6e4c6a770b0 (diff)
downloadopenssh-git-782fe9e725243eeb5ad6ab9a1783b5d6bedfe0d7.tar.gz
Add the standard environment variable passing to sshbaserock/tiagogomes/armv8l64baserock/morph
Conflicts: ssh_config sshd_config
-rw-r--r--ssh_config2
-rw-r--r--sshd_config4
2 files changed, 5 insertions, 1 deletions
diff --git a/ssh_config b/ssh_config
index 03a228fb..e99cda95 100644
--- a/ssh_config
+++ b/ssh_config
@@ -46,3 +46,5 @@
# VisualHostKey no
# ProxyCommand ssh -q -W %h:%p gateway.example.com
# RekeyLimit 1G 1h
+
+SendEnv LANG LC_*
diff --git a/sshd_config b/sshd_config
index e9045bc4..089119cc 100644
--- a/sshd_config
+++ b/sshd_config
@@ -108,7 +108,7 @@ AuthorizedKeysFile .ssh/authorized_keys
#TCPKeepAlive yes
#UseLogin no
UsePrivilegeSeparation sandbox # Default for new installations.
-#PermitUserEnvironment no
+PermitUserEnvironment yes
#Compression delayed
#ClientAliveInterval 0
#ClientAliveCountMax 3
@@ -131,3 +131,5 @@ Subsystem sftp /usr/libexec/sftp-server
# AllowTcpForwarding no
# PermitTTY no
# ForceCommand cvs server
+
+AcceptEnv LANG LC_*