summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-15 12:06:55 +1100
committerDamien Miller <djm@mindrot.org>2006-03-15 12:06:55 +1100
commitcc3e8ba3c24357b912dd7071ba34ab863de593bd (patch)
tree2295dd2ef1b1ab6f45ed930a4e27d6db5da1b285
parentde85a28825de0dea6aa5b6d3e79f7207d7dda51d (diff)
- markus@cvs.openbsd.org 2006/03/14 16:32:48
[ssh_config.5 sshd_config.5] *AliveCountMax applies to protcol v2 only; ok dtucker, djm
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.53
-rw-r--r--sshd_config.53
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 57c97c85..3064b306 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -233,6 +233,9 @@
[canohost.c]
log the originating address and not just the name when a reverse
mapping check fails, requested by linux AT linuon.com
+ - markus@cvs.openbsd.org 2006/03/14 16:32:48
+ [ssh_config.5 sshd_config.5]
+ *AliveCountMax applies to protcol v2 only; ok dtucker, djm
20060313
- (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4134,4 +4137,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4205 2006/03/15 01:06:41 djm Exp $
+$Id: ChangeLog,v 1.4206 2006/03/15 01:06:55 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index f7c9f714..5b02ef82 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: ssh_config.5,v 1.88 2006/03/13 10:14:29 dtucker Exp $
+.\" $OpenBSD: ssh_config.5,v 1.89 2006/03/14 16:32:48 markus Exp $
.Dd September 25, 1999
.Dt SSH_CONFIG 5
.Os
@@ -845,6 +845,7 @@ If, for example,
.Cm ServerAliveCountMax
is left at the default, if the server becomes unresponsive,
ssh will disconnect after approximately 45 seconds.
+This option applies to protocol version 2 only.
.It Cm ServerAliveInterval
Sets a timeout interval in seconds after which if no data has been received
from the server,
diff --git a/sshd_config.5 b/sshd_config.5
index 1bd3a624..aad28f4c 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: sshd_config.5,v 1.56 2006/03/13 10:14:29 dtucker Exp $
+.\" $OpenBSD: sshd_config.5,v 1.57 2006/03/14 16:32:48 markus Exp $
.Dd September 25, 1999
.Dt SSHD_CONFIG 5
.Os
@@ -223,6 +223,7 @@ If
.Cm ClientAliveCountMax
is left at the default, unresponsive SSH clients
will be disconnected after approximately 45 seconds.
+This option applies to protocol version 2 only.
.It Cm ClientAliveInterval
Sets a timeout interval in seconds after which if no data has been received
from the client,