- tests require kernel with NO_NEW_PRIVS prctl support (the same for default configur...

[packages/openssh.git] / openssh-config.patch

diff --git a/openssh-config.patch b/openssh-config.patch
index 4aefe885857f6271b35d4a5d7769a004ed46c695..80c499508261e5d763d44847bead53a6449573f9 100644 (file)
--- a/openssh-config.patch
+++ b/openssh-config.patch
@@ -51,11 +51,22 @@
  #Banner /some/path
  
 +# Accept locale-related environment variables, also accept some GIT vars
-+AcceptEnv LANG LC_* LANGUAGE TZ GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL
++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 @@
@@ -93,5 +104,5 @@
 +      ServerAliveCountMax 10
 +      TCPKeepAlive no
 +# Send locale-related environment variables, also pass some GIT vars
-+      SendEnv LANG LC_* LANGUAGE TZ GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL
++      SendEnv LANG LC_* LANGUAGE XMODIFIERS TZ GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL
 +      HashKnownHosts yes