summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh.17
-rw-r--r--sshd.89
3 files changed, 11 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 43b69475a..19ab35642 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -72,6 +72,9 @@
72 - markus@cvs.openbsd.org 2002/02/03 17:59:23 72 - markus@cvs.openbsd.org 2002/02/03 17:59:23
73 [sshconnect2.c] 73 [sshconnect2.c]
74 more cross checking if announced vs. used key type; ok stevesk@ 74 more cross checking if announced vs. used key type; ok stevesk@
75 - stevesk@cvs.openbsd.org 2002/02/03 22:35:57
76 [ssh.1 sshd.8]
77 some KeepAlive cleanup/clarify; ok markus@
75 78
7620020130 7920020130
77 - (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@ 80 - (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@
@@ -7474,4 +7477,4 @@
7474 - Wrote replacements for strlcpy and mkdtemp 7477 - Wrote replacements for strlcpy and mkdtemp
7475 - Released 1.0pre1 7478 - Released 1.0pre1
7476 7479
7477$Id: ChangeLog,v 1.1818 2002/02/05 01:23:32 djm Exp $ 7480$Id: ChangeLog,v 1.1819 2002/02/05 01:23:58 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 08f0c6ce8..c44f4ae2c 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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: ssh.1,v 1.145 2002/01/29 23:50:37 markus Exp $ 37.\" $OpenBSD: ssh.1,v 1.146 2002/02/03 22:35:57 stevesk Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -935,7 +935,7 @@ It is possible to have
935multiple identity files specified in configuration files; all these 935multiple identity files specified in configuration files; all these
936identities will be tried in sequence. 936identities will be tried in sequence.
937.It Cm KeepAlive 937.It Cm KeepAlive
938Specifies whether the system should send keepalive messages to the 938Specifies whether the system should send TCP keepalive messages to the
939other side. 939other side.
940If they are sent, death of the connection or crash of one 940If they are sent, death of the connection or crash of one
941of the machines will be properly noticed. 941of the machines will be properly noticed.
@@ -950,8 +950,7 @@ if the network goes down or the remote host dies.
950This is important in scripts, and many users want it too. 950This is important in scripts, and many users want it too.
951.Pp 951.Pp
952To disable keepalives, the value should be set to 952To disable keepalives, the value should be set to
953.Dq no 953.Dq no .
954in both the server and the client configuration files.
955.It Cm KerberosAuthentication 954.It Cm KerberosAuthentication
956Specifies whether Kerberos authentication will be used. 955Specifies whether Kerberos authentication will be used.
957The argument to this keyword must be 956The argument to this keyword must be
diff --git a/sshd.8 b/sshd.8
index 9a8d59fd1..ea5dd03e2 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.165 2002/01/29 14:32:03 markus Exp $ 37.\" $OpenBSD: sshd.8,v 1.166 2002/02/03 22:35:57 stevesk Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -533,7 +533,7 @@ or
533The default is 533The default is
534.Dq no . 534.Dq no .
535.It Cm KeepAlive 535.It Cm KeepAlive
536Specifies whether the system should send keepalive messages to the 536Specifies whether the system should send TCP keepalive messages to the
537other side. 537other side.
538If they are sent, death of the connection or crash of one 538If they are sent, death of the connection or crash of one
539of the machines will be properly noticed. 539of the machines will be properly noticed.
@@ -548,12 +548,11 @@ users and consuming server resources.
548The default is 548The default is
549.Dq yes 549.Dq yes
550(to send keepalives), and the server will notice 550(to send keepalives), and the server will notice
551if the network goes down or the client host reboots. 551if the network goes down or the client host crashes.
552This avoids infinitely hanging sessions. 552This avoids infinitely hanging sessions.
553.Pp 553.Pp
554To disable keepalives, the value should be set to 554To disable keepalives, the value should be set to
555.Dq no 555.Dq no .
556in both the server and the client configuration files.
557.It Cm KerberosAuthentication 556.It Cm KerberosAuthentication
558Specifies whether Kerberos authentication is allowed. 557Specifies whether Kerberos authentication is allowed.
559This can be in the form of a Kerberos ticket, or if 558This can be in the form of a Kerberos ticket, or if