updates from OpenSSH 3.8p1 release

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

diff --git a/setup/sshd_config.in b/setup/sshd_config.in
index cd0462303b1069ab455f4a64163735b1addee970..661ed5f2324c2cf99707cd2cdbbc8204be6f3d1d 100644 (file)
--- a/setup/sshd_config.in
+++ b/setup/sshd_config.in
@@ -1,4 +1,4 @@
-#      $OpenBSD: sshd_config,v 1.65 2003/08/28 12:54:34 markus Exp $
+#      $OpenBSD: sshd_config,v 1.68 2003/12/29 16:39:50 millert Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -61,6 +61,7 @@
 #KerberosAuthentication no
 #KerberosOrLocalPasswd yes
 #KerberosTicketCleanup yes
+#KerberosGetAFSToken no
 
 # Session hooks: if allowed, specify the commands to execute
 #AllowSessionHooks yes
@@ -69,12 +70,12 @@
 
 # GSSAPI options
 #GSSAPIAuthentication yes
-#GSSAPICleanupCreds yes
+#GSSAPICleanupCredentials yes
 
 # Set this to 'yes' to enable PAM authentication (via challenge-response)
 # and session processing. Depending on your PAM configuration, this may
-# bypass the setting of 'PasswordAuthentication'
-#UsePAM yes
+# bypass the setting of 'PasswordAuthentication' and 'PermitEmptyPasswords'
+#UsePAM no
 
 #AllowTcpForwarding yes
 #GatewayPorts no
@@ -83,7 +84,7 @@ X11Forwarding yes
 #X11UseLocalhost yes
 #PrintMotd yes
 #PrintLastLog yes
-#KeepAlive yes
+#TCPKeepAlive yes
 #UseLogin no
 #UsePrivilegeSeparation yes
 #PermitUserEnvironment no