updates for 3.8

diff --git a/setup/ssh_config b/setup/ssh_config
index e0d007dad15f04d23d749285a1e28b88627cde53..71b3734dfdfeb6f14e08bdadd5552c5d25a4bcbc 100644 (file)
--- a/setup/ssh_config
+++ b/setup/ssh_config
@@ -1,4 +1,4 @@
-#      $OpenBSD: ssh_config,v 1.20 2005/01/28 09:45:53 dtucker Exp $
+#      $OpenBSD: ssh_config,v 1.21 2005/12/06 22:38:27 reyk Exp $
 
 # This is the ssh client system-wide configuration file.  See
 # ssh_config(5) for more information.  This file provides defaults for
@@ -37,6 +37,9 @@
 #   Cipher 3des
 #   Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
 #   EscapeChar ~
+#   Tunnel no
+#   TunnelDevice any:any
+#   PermitLocalCommand no
 
 Host *
   ForwardX11 yes

diff --git a/setup/sshd_config.in b/setup/sshd_config.in
index 3db490f5129c5f5639f539a60e9c0a4e290c18c1..3065e7cfcb132d75ded1e9e82eb345c089b9bbac 100644 (file)
--- a/setup/sshd_config.in
+++ b/setup/sshd_config.in
@@ -1,4 +1,4 @@
-#      $OpenBSD: sshd_config,v 1.72 2005/07/25 11:59:40 markus Exp $
+#      $OpenBSD: sshd_config,v 1.73 2005/12/06 22:38:28 reyk Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -101,9 +101,24 @@ X11Forwarding yes
 #UseDNS yes
 #PidFile /var/run/sshd.pid
 #MaxStartups 10
+#PermitTunnel no
+
+# override default of no subsystems
+Subsystem      sftp    /usr/libexec/sftp-server
 
 # no default banner path
 #Banner /some/path
 
-# override default of no subsystems
-Subsystem      sftp    /usr/libexec/sftp-server
+# the following are HPN related configuration options
+# tcp receive buffer polling. enable in autotuning kernels
+#TcpRcvBufPoll no
+
+# allow the use of the none cipher
+#NoneEnabled no
+
+# disable hpn performance boosts. 
+#HPNDisabled no
+
+# buffer size for hpn to non-hn connections
+#HPNBufferSize 2048
+