- (tim) [configure.ac] Add AC_REVISION. Add sys/time.h to lastlog.h test

[openssh.git] / sshd_config.5

diff --git a/sshd_config.5 b/sshd_config.5
index 70d18ab0f4820d074a14326987e1867fa2228ca8..71a293ffb223013ec92677038504eee27ac78241 100644 (file)
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"

-.\" $OpenBSD: sshd_config.5,v 1.42 2005/05/19 02:39:55 djm Exp $
+.\" $OpenBSD: sshd_config.5,v 1.48 2006/01/02 17:09:49 jmc Exp $

 .Dd September 25, 1999
 .Dt SSHD_CONFIG 5
 .Os
 .Dd September 25, 1999
 .Dt SSHD_CONFIG 5
 .Os


@@ -168,17 +168,20 @@ The supported ciphers are
 .Dq aes128-ctr ,
 .Dq aes192-ctr ,
 .Dq aes256-ctr ,
 .Dq aes128-ctr ,
 .Dq aes192-ctr ,
 .Dq aes256-ctr ,

+.Dq arcfour128 ,
+.Dq arcfour256 ,

 .Dq arcfour ,
 .Dq blowfish-cbc ,
 and
 .Dq cast128-cbc .
 The default is
 .Bd -literal
 .Dq arcfour ,
 .Dq blowfish-cbc ,
 and
 .Dq cast128-cbc .
 The default is
 .Bd -literal

-  ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,
-    aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr''
+  ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128,
+    arcfour256,arcfour,aes192-cbc,aes256-cbc,aes128-ctr,
+    aes192-ctr,aes256-ctr''

 .Ed
 .It Cm ClientAliveCountMax
 .Ed
 .It Cm ClientAliveCountMax

-Sets the number of client alive messages (see above) which may be
+Sets the number of client alive messages (see below) which may be

 sent without
 .Nm sshd
 receiving any messages back from the client.
 sent without
 .Nm sshd
 receiving any messages back from the client.


@@ -200,7 +203,7 @@ server depend on knowing when a connection has become inactive.
 The default value is 3.
 If
 .Cm ClientAliveInterval
 The default value is 3.
 If
 .Cm ClientAliveInterval

-(above) is set to 15, and
+(see below) is set to 15, and

 .Cm ClientAliveCountMax
 is left at the default, unresponsive ssh clients
 will be disconnected after approximately 45 seconds.
 .Cm ClientAliveCountMax
 is left at the default, unresponsive ssh clients
 will be disconnected after approximately 45 seconds.


@@ -214,13 +217,15 @@ The default
 is 0, indicating that these messages will not be sent to the client.
 This option applies to protocol version 2 only.
 .It Cm Compression
 is 0, indicating that these messages will not be sent to the client.
 This option applies to protocol version 2 only.
 .It Cm Compression

-Specifies whether compression is allowed.
+Specifies whether compression is allowed, or delayed until
+the user has authenticated successfully.

 The argument must be
 The argument must be

-.Dq yes
+.Dq yes ,
+.Dq delayed ,

 or
 .Dq no .
 The default is
 or
 .Dq no .
 The default is

-.Dq yes .
+.Dq delayed .

 .It Cm DenyGroups
 This keyword can be followed by a list of group name patterns, separated
 by spaces.
 .It Cm DenyGroups
 This keyword can be followed by a list of group name patterns, separated
 by spaces.


@@ -343,7 +348,7 @@ Kerberos servtab which allows the verification of the KDC's identity.
 Default is
 .Dq no .
 .It Cm KerberosGetAFSToken
 Default is
 .Dq no .
 .It Cm KerberosGetAFSToken

-If AFS is active and the user has a Kerberos 5 TGT, attempt to aquire
+If AFS is active and the user has a Kerberos 5 TGT, attempt to acquire

 an AFS token before accessing the user's home directory.
 Default is
 .Dq no .
 an AFS token before accessing the user's home directory.
 Default is
 .Dq no .


@@ -497,6 +502,18 @@ All other authentication methods are disabled for root.
 If this option is set to
 .Dq no
 root is not allowed to log in.
 If this option is set to
 .Dq no
 root is not allowed to log in.

+.It Cm PermitTunnel
+Specifies whether
+.Xr tun 4
+device forwarding is allowed.
+The argument must be
+.Dq yes ,
+.Dq point-to-point ,
+.Dq ethernet
+or
+.Dq no .
+The default is
+.Dq no .

 .It Cm PermitUserEnvironment
 Specifies whether
 .Pa ~/.ssh/environment
 .It Cm PermitUserEnvironment
 Specifies whether
 .Pa ~/.ssh/environment