From 6bd3886406d4fb7e131d35f70b5ae93b20e02a44 Mon Sep 17 00:00:00 2001
From: Luke Faraone <lfaraone@humbughq.com>
Date: Tue, 18 Jun 2013 13:29:01 -0700
Subject: [PATCH] Don't pass along client locale settings when sshing in to our
 servers

(imported from commit d25f2a47b60c1ac7e4dcbd4a0133d0c0c9698b4e)
---
 servers/puppet/modules/humbug/files/sshd_config | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/servers/puppet/modules/humbug/files/sshd_config b/servers/puppet/modules/humbug/files/sshd_config
index 8124da8d83..9e13f45180 100644
--- a/servers/puppet/modules/humbug/files/sshd_config
+++ b/servers/puppet/modules/humbug/files/sshd_config
@@ -69,8 +69,9 @@ TCPKeepAlive yes
 #MaxStartups 10:30:60
 #Banner /etc/issue.net
 
-# Allow client to pass locale environment variables
-AcceptEnv LANG LC_*
+# Commented out to prevent use of client locales. This causes problems
+# otherwise if our developers have a non-standard locale.
+#AcceptEnv LANG LC_*
 
 Subsystem sftp /usr/lib/openssh/sftp-server