# no default banner path
#Banner /some/path
-+# Accept locale-related environment variables, also accept GIT vars
-+AcceptEnv LANG LC_* LANGUAGE TZ GIT_*
++# Accept locale-related environment variables, also accept some GIT vars
++AcceptEnv LANG LC_* LANGUAGE XMODIFIERS TZ GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL
+
# override default of no subsystems
Subsystem sftp /usr/libexec/sftp-server
+@@ -119,6 +130,10 @@
+ # override default of no subsystems
+ Subsystem sftp /usr/libexec/sftp-server
+
++# Uncomment this if you want to use .local domain
++#Host *.local
++# CheckHostIP no
++
+ # Example of overriding settings on a per-user basis
+ #Match User anoncvs
+ # X11Forwarding no
--- openssh-4.6p1/ssh_config~ 2006-06-13 05:01:10.000000000 +0200
+++ openssh-4.6p1/ssh_config 2007-10-13 02:00:16.000000000 +0200
@@ -20,12 +20,15 @@
# CheckHostIP yes
# AddressFamily any
@@ -42,3 +45,19 @@
- # Tunnel no
- # TunnelDevice any:any
- # PermitLocalCommand no
+ # VisualHostKey no
+ # ProxyCommand ssh -q -W %h:%p gateway.example.com
+ # RekeyLimit 1G 1h
+
+Host *
+ GSSAPIAuthentication yes
+ ServerAliveInterval 60
+ ServerAliveCountMax 10
+ TCPKeepAlive no
-+# Send locale-related environment variables, also pass GIT vars
-+ SendEnv LANG LC_* LANGUAGE TZ GIT_*
++# Send locale-related environment variables, also pass some GIT vars
++ SendEnv LANG LC_* LANGUAGE XMODIFIERS TZ GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL
++ HashKnownHosts yes