summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/sshd_config.5
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2005-05-19 02:39:56 +0000
committerDamien Miller <djm@cvs.openbsd.org>2005-05-19 02:39:56 +0000
commit22d95bc4630130a61ca8db2bec5924a823c1ddb4 (patch)
treec49c0d0311c17cc51b432b52760ce649592f2b6c /usr.bin/ssh/sshd_config.5
parent03695d4296656a158fd5ec072c1c346327538af0 (diff)
sort config options, from grunk AT pestilenz.org; ok jmc@
Diffstat (limited to 'usr.bin/ssh/sshd_config.5')
-rw-r--r--usr.bin/ssh/sshd_config.520
1 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5
index a80ba94e994..087710afd43 100644
--- a/usr.bin/ssh/sshd_config.5
+++ b/usr.bin/ssh/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