X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=openssh-config.patch;h=80c499508261e5d763d44847bead53a6449573f9;hb=3eb72854a39c648838e1a459cadb017f76dc2fc7;hp=17325ce26753fedd192c2661dbb7b56e973cef5a;hpb=3a147655af607565d71a701f5da8fef5ce75a031;p=packages%2Fopenssh.git

diff --git a/openssh-config.patch b/openssh-config.patch
index 17325ce..80c4995 100644
--- a/openssh-config.patch
+++ b/openssh-config.patch
@@ -50,12 +50,23 @@
  # 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 @@
@@ -75,9 +86,9 @@
  #   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
@@ -92,5 +103,6 @@
 +	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