saving uncommitted changes in /etc prior to emerge run

diff --git a/ssh/ssh_config b/ssh/ssh_config
index 6cf70dbabafd62d6a9d8d2e085dcef0e91e26b9e..e66063fd042a598762794bb14676e7eb209c72d7 100644 (file)
--- a/ssh/ssh_config
+++ b/ssh/ssh_config
@@ -45,5 +45,8 @@
 #   ProxyCommand ssh -q -W %h:%p gateway.example.com
 #   RekeyLimit 1G 1h
 
-# Send locale environment variables #367017
-SendEnv LANG LC_*
+# Send locale environment variables. #367017
+SendEnv LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
+
+# Send COLORTERM to match TERM. #658540
+SendEnv COLORTERM

diff --git a/ssh/sshd_config b/ssh/sshd_config
index 77d3f30b47e932e9031bb3175c0b4150c12ceb62..e22bf7d5b7f53cc1b79e63923e0d0f76a2389528 100644 (file)
--- a/ssh/sshd_config
+++ b/ssh/sshd_config
@@ -115,5 +115,8 @@ Subsystem   sftp    /usr/lib64/misc/sftp-server
 #      PermitTTY no
 #      ForceCommand cvs server
 
-# Allow client to pass locale environment variables #367017
-AcceptEnv LANG LC_*
+# Allow client to pass locale environment variables. #367017
+AcceptEnv LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
+
+# Allow client to pass COLORTERM to match TERM. #658540
+AcceptEnv COLORTERM