- djm@cvs.openbsd.org 2005/05/19 02:39:55

[sshd_config.5]
     sort config options, from grunk AT pestilenz.org; ok jmc@
This commit is contained in:
Damien Miller 2005-05-26 12:12:19 +10:00
parent 17b23d8657
commit 1594ad5a78
2 changed files with 14 additions and 11 deletions

View File

@ -56,6 +56,9 @@
- markus@cvs.openbsd.org 2005/05/16 15:30:51 - markus@cvs.openbsd.org 2005/05/16 15:30:51
[readconf.c servconf.c] [readconf.c servconf.c]
check return value from strdelim() for NULL (AddressFamily); mpech check return value from strdelim() for NULL (AddressFamily); mpech
- djm@cvs.openbsd.org 2005/05/19 02:39:55
[sshd_config.5]
sort config options, from grunk AT pestilenz.org; ok jmc@
20050524 20050524
- (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
@ -2555,4 +2558,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3777 2005/05/26 02:11:56 djm Exp $ $Id: ChangeLog,v 1.3778 2005/05/26 02:12:19 djm Exp $

View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: sshd_config.5,v 1.41 2005/04/21 06:17:50 djm Exp $ .\" $OpenBSD: sshd_config.5,v 1.42 2005/05/19 02:39:55 djm Exp $
.Dd September 25, 1999 .Dd September 25, 1999
.Dt SSHD_CONFIG 5 .Dt SSHD_CONFIG 5
.Os .Os
@ -177,15 +177,6 @@ The default is
``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour, ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,
aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr'' aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr''
.Ed .Ed
.It Cm ClientAliveInterval
Sets a timeout interval in seconds after which if no data has been received
from the client,
.Nm sshd
will send a message through the encrypted
channel to request a response from the client.
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 ClientAliveCountMax .It Cm ClientAliveCountMax
Sets the number of client alive messages (see above) which may be Sets the number of client alive messages (see above) which may be
sent without sent without
@ -213,6 +204,15 @@ If
.Cm ClientAliveCountMax .Cm ClientAliveCountMax
is left at the default, unresponsive ssh clients is left at the default, unresponsive ssh clients
will be disconnected after approximately 45 seconds. will be disconnected after approximately 45 seconds.
.It Cm ClientAliveInterval
Sets a timeout interval in seconds after which if no data has been received
from the client,
.Nm sshd
will send a message through the encrypted
channel to request a response from the client.
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 .It Cm Compression
Specifies whether compression is allowed. Specifies whether compression is allowed.
The argument must be The argument must be