- (djm) OpenBSD CVS Sync

- jmc@cvs.openbsd.org 2006/01/02 17:09:49
     [ssh_config.5 sshd_config.5]
     some corrections from michael knudsen;
This commit is contained in:
Damien Miller 2006-01-03 18:47:31 +11:00
parent a07a59188a
commit b797770da2
3 changed files with 13 additions and 7 deletions

View File

@ -1,3 +1,9 @@
20060103
- (djm) OpenBSD CVS Sync
- jmc@cvs.openbsd.org 2006/01/02 17:09:49
[ssh_config.5 sshd_config.5]
some corrections from michael knudsen;
20060102 20060102
- (djm) [README.tun] Add README.tun, missed during sync of tun(4) support - (djm) [README.tun] Add README.tun, missed during sync of tun(4) support
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync
@ -3622,4 +3628,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4071 2006/01/02 12:41:37 djm Exp $ $Id: ChangeLog,v 1.4072 2006/01/03 07:47:31 djm Exp $

View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: ssh_config.5,v 1.72 2005/12/22 10:31:40 jmc Exp $ .\" $OpenBSD: ssh_config.5,v 1.73 2006/01/02 17:09:49 jmc Exp $
.Dd September 25, 1999 .Dd September 25, 1999
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
@ -797,7 +797,7 @@ across multiple
directives. directives.
The default is not to send any environment variables. The default is not to send any environment variables.
.It Cm ServerAliveCountMax .It Cm ServerAliveCountMax
Sets the number of server alive messages (see above) which may be Sets the number of server alive messages (see below) which may be
sent without sent without
.Nm ssh .Nm ssh
receiving any messages back from the server. receiving any messages back from the server.
@ -819,7 +819,7 @@ server depend on knowing when a connection has become inactive.
The default value is 3. The default value is 3.
If, for example, If, for example,
.Cm ServerAliveInterval .Cm ServerAliveInterval
(above) is set to 15, and (see below) is set to 15, and
.Cm ServerAliveCountMax .Cm ServerAliveCountMax
is left at the default, if the server becomes unresponsive ssh is left at the default, if the server becomes unresponsive ssh
will disconnect after approximately 45 seconds. will disconnect after approximately 45 seconds.

View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: sshd_config.5,v 1.47 2005/12/08 18:34:11 reyk Exp $ .\" $OpenBSD: sshd_config.5,v 1.48 2006/01/02 17:09:49 jmc Exp $
.Dd September 25, 1999 .Dd September 25, 1999
.Dt SSHD_CONFIG 5 .Dt SSHD_CONFIG 5
.Os .Os
@ -181,7 +181,7 @@ The default is
aes192-ctr,aes256-ctr'' aes192-ctr,aes256-ctr''
.Ed .Ed
.It Cm ClientAliveCountMax .It Cm ClientAliveCountMax
Sets the number of client alive messages (see above) which may be Sets the number of client alive messages (see below) which may be
sent without sent without
.Nm sshd .Nm sshd
receiving any messages back from the client. receiving any messages back from the client.
@ -203,7 +203,7 @@ server depend on knowing when a connection has become inactive.
The default value is 3. The default value is 3.
If If
.Cm ClientAliveInterval .Cm ClientAliveInterval
(above) is set to 15, and (see below) is set to 15, and
.Cm ClientAliveCountMax .Cm ClientAliveCountMax
is left at the default, unresponsive ssh clients is left at the default, unresponsive ssh clients
will be disconnected after approximately 45 seconds. will be disconnected after approximately 45 seconds.