summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshd.86
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ee05bbc80..93cabb88f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,9 @@
33 - markus@cvs.openbsd.org 2001/11/07 22:10:28 33 - markus@cvs.openbsd.org 2001/11/07 22:10:28
34 [ssh-dss.c ssh-rsa.c] 34 [ssh-dss.c ssh-rsa.c]
35 missing free and sync dss/rsa code. 35 missing free and sync dss/rsa code.
36 - markus@cvs.openbsd.org 2001/11/07 22:12:01
37 [sshd.8]
38 s/Keepalive/KeepAlive/; from openbsd@davidkrause.com
36 39
3720011109 4020011109
38 - (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK) 41 - (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK)
@@ -6842,4 +6845,4 @@
6842 - Wrote replacements for strlcpy and mkdtemp 6845 - Wrote replacements for strlcpy and mkdtemp
6843 - Released 1.0pre1 6846 - Released 1.0pre1
6844 6847
6845$Id: ChangeLog,v 1.1644 2001/11/12 00:03:35 djm Exp $ 6848$Id: ChangeLog,v 1.1645 2001/11/12 00:04:05 djm Exp $
diff --git a/sshd.8 b/sshd.8
index c3a2e1ee4..d7e5937cf 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.153 2001/09/27 17:53:24 camield Exp $ 37.\" $OpenBSD: sshd.8,v 1.154 2001/11/07 22:12:01 markus Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -402,11 +402,11 @@ reached while client alive messages are being sent,
402.Nm 402.Nm
403will disconnect the client, terminating the session. It is important 403will disconnect the client, terminating the session. It is important
404to note that the use of client alive messages is very different from 404to note that the use of client alive messages is very different from
405.Cm Keepalive 405.Cm KeepAlive
406(below). The client alive messages are sent through the 406(below). The client alive messages are sent through the
407encrypted channel and therefore will not be spoofable. The TCP keepalive 407encrypted channel and therefore will not be spoofable. The TCP keepalive
408option enabled by 408option enabled by
409.Cm Keepalive 409.Cm KeepAlive
410is spoofable. The client alive mechanism is valuable when the client or 410is spoofable. The client alive mechanism is valuable when the client or
411server depend on knowing when a connection has become inactive. 411server depend on knowing when a connection has become inactive.
412.Pp 412.Pp