4.4 release

[gssapi-openssh.git] / setup / sshd_config.in

diff --git a/setup/sshd_config.in b/setup/sshd_config.in
index bd214846b58ef5b9c88d3b5e4f5a442358e61768..badf4af21c7c2c9e8319b5fa09ad3252dac37c71 100644 (file)
--- a/setup/sshd_config.in
+++ b/setup/sshd_config.in
@@ -1,4 +1,4 @@
-#      $OpenBSD: sshd_config,v 1.77 2008/02/08 23:24:07 djm Exp $
+#      $OpenBSD: sshd_config,v 1.80 2008/07/02 02:24:18 djm Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -28,7 +28,7 @@ Protocol 2
 
 # Lifetime and size of ephemeral version 1 server key
 #KeyRegenerationInterval 1h
-#ServerKeyBits 768
+#ServerKeyBits 1024
 
 # Logging
 # obsoletes QuietMode and FascistLogging
@@ -41,6 +41,7 @@ Protocol 2
 #PermitRootLogin yes
 #StrictModes yes
 #MaxAuthTries 6
+#MaxSessions 10
 
 #RSAAuthentication yes
 #PubkeyAuthentication yes
@@ -76,6 +77,7 @@ Protocol 2
 
 # GSSAPI options
 #GSSAPIAuthentication yes
+#GSSAPIDelegateCredentials yes
 #GSSAPICleanupCredentials yes
 #GSSAPIStrictAcceptorCheck yes
 #GSSAPIKeyExchange yes
@@ -91,6 +93,7 @@ Protocol 2
 # and ChallengeResponseAuthentication to 'no'.
 #UsePAM yes
 
+#AllowAgentForwarding yes
 #AllowTcpForwarding yes
 #GatewayPorts no
 X11Forwarding yes
@@ -117,7 +120,6 @@ X11Forwarding yes
 # override default of no subsystems
 Subsystem      sftp    /usr/libexec/sftp-server
 
-
 # the following are HPN related configuration options
 # tcp receive buffer polling. disable in non autotuning kernels
 #TcpRcvBufPoll yes