From 1594ad5a780400e1a8bfe92bd041ae82450d3d17 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 26 May 2005 12:12:19 +1000 Subject: - djm@cvs.openbsd.org 2005/05/19 02:39:55 [sshd_config.5] sort config options, from grunk AT pestilenz.org; ok jmc@ --- ChangeLog | 5 ++++- sshd_config.5 | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 15d1a7490..75d2ee5b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,9 @@ - markus@cvs.openbsd.org 2005/05/16 15:30:51 [readconf.c servconf.c] 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 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] @@ -2555,4 +2558,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (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 $ diff --git a/sshd_config.5 b/sshd_config.5 index df51fb867..70d18ab0f 100644 --- 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. .\" -.\" $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 .Dt SSHD_CONFIG 5 .Os @@ -177,15 +177,6 @@ The default is ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour, aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr'' .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 Sets the number of client alive messages (see above) which may be sent without @@ -213,6 +204,15 @@ If .Cm ClientAliveCountMax is left at the default, unresponsive ssh clients 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 Specifies whether compression is allowed. The argument must be -- cgit v1.2.3