summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--ssh_config.56
-rw-r--r--sshd_config.56
3 files changed, 13 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 99b7aedcd..60ea75fd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120060103
2 - (djm) OpenBSD CVS Sync
3 - jmc@cvs.openbsd.org 2006/01/02 17:09:49
4 [ssh_config.5 sshd_config.5]
5 some corrections from michael knudsen;
6
120060102 720060102
2 - (djm) [README.tun] Add README.tun, missed during sync of tun(4) support 8 - (djm) [README.tun] Add README.tun, missed during sync of tun(4) support
3 - (djm) OpenBSD CVS Sync 9 - (djm) OpenBSD CVS Sync
@@ -3622,4 +3628,4 @@
3622 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3628 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3623 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3629 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3624 3630
3625$Id: ChangeLog,v 1.4071 2006/01/02 12:41:37 djm Exp $ 3631$Id: ChangeLog,v 1.4072 2006/01/03 07:47:31 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 072ea11a1..d091bcbf9 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -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_config.5,v 1.72 2005/12/22 10:31:40 jmc Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.73 2006/01/02 17:09:49 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
@@ -797,7 +797,7 @@ across multiple
797directives. 797directives.
798The default is not to send any environment variables. 798The default is not to send any environment variables.
799.It Cm ServerAliveCountMax 799.It Cm ServerAliveCountMax
800Sets the number of server alive messages (see above) which may be 800Sets the number of server alive messages (see below) which may be
801sent without 801sent without
802.Nm ssh 802.Nm ssh
803receiving any messages back from the server. 803receiving any messages back from the server.
@@ -819,7 +819,7 @@ server depend on knowing when a connection has become inactive.
819The default value is 3. 819The default value is 3.
820If, for example, 820If, for example,
821.Cm ServerAliveInterval 821.Cm ServerAliveInterval
822(above) is set to 15, and 822(see below) is set to 15, and
823.Cm ServerAliveCountMax 823.Cm ServerAliveCountMax
824is left at the default, if the server becomes unresponsive ssh 824is left at the default, if the server becomes unresponsive ssh
825will disconnect after approximately 45 seconds. 825will disconnect after approximately 45 seconds.
diff --git a/sshd_config.5 b/sshd_config.5
index a10b365d3..71a293ffb 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -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_config.5,v 1.47 2005/12/08 18:34:11 reyk Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.48 2006/01/02 17:09:49 jmc Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD_CONFIG 5 39.Dt SSHD_CONFIG 5
40.Os 40.Os
@@ -181,7 +181,7 @@ The default is
181 aes192-ctr,aes256-ctr'' 181 aes192-ctr,aes256-ctr''
182.Ed 182.Ed
183.It Cm ClientAliveCountMax 183.It Cm ClientAliveCountMax
184Sets the number of client alive messages (see above) which may be 184Sets the number of client alive messages (see below) which may be
185sent without 185sent without
186.Nm sshd 186.Nm sshd
187receiving any messages back from the client. 187receiving any messages back from the client.
@@ -203,7 +203,7 @@ server depend on knowing when a connection has become inactive.
203The default value is 3. 203The default value is 3.
204If 204If
205.Cm ClientAliveInterval 205.Cm ClientAliveInterval
206(above) is set to 15, and 206(see below) is set to 15, and
207.Cm ClientAliveCountMax 207.Cm ClientAliveCountMax
208is left at the default, unresponsive ssh clients 208is left at the default, unresponsive ssh clients
209will be disconnected after approximately 45 seconds. 209will be disconnected after approximately 45 seconds.