summaryrefslogtreecommitdiff
path: root/usr/src/cmd/ssh/libssh/common/g11n.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/cmd/ssh/libssh/common/g11n.c')
-rw-r--r--usr/src/cmd/ssh/libssh/common/g11n.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/usr/src/cmd/ssh/libssh/common/g11n.c b/usr/src/cmd/ssh/libssh/common/g11n.c
index 52e5ddf4d7..2a8af8a46e 100644
--- a/usr/src/cmd/ssh/libssh/common/g11n.c
+++ b/usr/src/cmd/ssh/libssh/common/g11n.c
@@ -237,8 +237,12 @@ g11n_setlocale(int category, const char *locale)
*/
switch (category) {
case LC_ALL:
+ /*
+ * We must not set LC_ALL environment variable here because if we
+ * did it would later override any other LC_* variables that were
+ * requested from the other side.
+ */
setenv("LANG", locale, 1);
- setenv("LC_ALL", locale, 1);
break;
case LC_CTYPE:
setenv("LC_CTYPE", locale, 1);