diff options
author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2013-04-30 16:34:47 +0000 |
---|---|---|
committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2013-04-30 16:34:47 +0000 |
commit | 6d43023b30937b1744703d64790f0117ac1992eb (patch) | |
tree | e8b7e10df14f41c0d84872fd50319b26a802813e | |
parent | 3a5c3c15043ce951d8c206b6572ab142434e51f5 (diff) | |
parent | 91e7ac97f6dc8f18b865f6cf51eaa436ec12b1bb (diff) | |
download | openssh-6d43023b30937b1744703d64790f0117ac1992eb.tar.gz |
Merge branch 'baserock/tiagogomes/openssh-branch2' of git://git.baserock.org/delta/openssh into baserock/morph
Reviewed by Lars Wirzenius
-rw-r--r-- | ssh_config | 2 | ||||
-rw-r--r-- | sshd_config | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -45,3 +45,5 @@ # PermitLocalCommand no # VisualHostKey no # ProxyCommand ssh -q -W %h:%p gateway.example.com + +SendEnv LANG LC_* diff --git a/sshd_config b/sshd_config index 473e8665..ca2a5093 100644 --- a/sshd_config +++ b/sshd_config @@ -98,7 +98,7 @@ AuthorizedKeysFile .ssh/authorized_keys #TCPKeepAlive yes #UseLogin no #UsePrivilegeSeparation yes -#PermitUserEnvironment no +PermitUserEnvironment yes #Compression delayed #ClientAliveInterval 0 #ClientAliveCountMax 3 @@ -119,3 +119,5 @@ Subsystem sftp /usr/libexec/sftp-server # X11Forwarding no # AllowTcpForwarding no # ForceCommand cvs server + +AcceptEnv LANG LC_* |