summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshd.818
2 files changed, 16 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d84abf79..c4323d337 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
13 [clientloop.c] 13 [clientloop.c]
14 set stdin/out/err to nonblocking in SSH proto 1, too. suggested by ho@ 14 set stdin/out/err to nonblocking in SSH proto 1, too. suggested by ho@
15 should fix some of the blocking problems for rsync over SSH-1 15 should fix some of the blocking problems for rsync over SSH-1
16 - stevesk@cvs.openbsd.org 2001/04/15 19:41:21
17 [sshd.8]
18 some ClientAlive cleanup; ok markus@
16 - (djm) Convert mandoc manpages to man automatically. Patch from Mark D. 19 - (djm) Convert mandoc manpages to man automatically. Patch from Mark D.
17 Roth <roth+openssh@feep.net> 20 Roth <roth+openssh@feep.net>
18 21
@@ -5100,4 +5103,4 @@
5100 - Wrote replacements for strlcpy and mkdtemp 5103 - Wrote replacements for strlcpy and mkdtemp
5101 - Released 1.0pre1 5104 - Released 1.0pre1
5102 5105
5103$Id: ChangeLog,v 1.1121 2001/04/16 02:01:25 mouring Exp $ 5106$Id: ChangeLog,v 1.1122 2001/04/16 02:03:49 mouring Exp $
diff --git a/sshd.8 b/sshd.8
index 887cc3ba3..e8af65a8c 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: sshd.8,v 1.115 2001/04/13 22:46:54 beck Exp $ 37.\" $OpenBSD: sshd.8,v 1.116 2001/04/15 19:41:21 stevesk Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -368,9 +368,10 @@ Sets a timeout interval in seconds after which if no data has been received
368from the client, 368from the client,
369.Nm 369.Nm
370will send a message through the encrypted 370will send a message through the encrypted
371channel to request a response from the client. This may only be 371channel to request a response from the client.
372used on a server supporting only protocol version 2. The default 372The default
373is 0, indicating that these messages will not be sent to the client. 373is 0, indicating that these messages will not be sent to the client.
374This option applies to protocol version 2 only.
374.It Cm ClientAliveCountMax 375.It Cm ClientAliveCountMax
375Sets the number of client alive messages (see above) which may be 376Sets the number of client alive messages (see above) which may be
376sent without 377sent without
@@ -380,12 +381,17 @@ reached while client alive messages are being sent,
380.Nm 381.Nm
381will disconnect the client, terminating the session. It is important 382will disconnect the client, terminating the session. It is important
382to note that the use of client alive messages is very different from 383to note that the use of client alive messages is very different from
383Keepalive (below). The client alive messages are sent through the 384.Cm Keepalive
385(below). The client alive messages are sent through the
384encrypted channel and therefore will not be spoofable. The TCP keepalive 386encrypted channel and therefore will not be spoofable. The TCP keepalive
385option enable by Keepalive is spoofable. You want to use the client 387option enabled by
388.Cm Keepalive
389is spoofable. You want to use the client
386alive mechanism when you are basing something important on 390alive mechanism when you are basing something important on
387clients having an active connection to the server. 391clients having an active connection to the server.
388 The default is value is 3. If you set ClientAliveInterval 392.Pp
393The default value is 3. If you set
394.Cm ClientAliveInterval
389(above) to 15, and leave this value at the default, unresponsive ssh clients 395(above) to 15, and leave this value at the default, unresponsive ssh clients
390will be disconnected after approximately 45 seconds. 396will be disconnected after approximately 45 seconds.
391.It Cm DenyGroups 397.It Cm DenyGroups