summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2019-08-09 04:24:03 +0000
committerDamien Miller <djm@mindrot.org>2019-08-09 15:11:30 +1000
commit8fdbc7247f432578abaaca1b72a0dbf5058d67e5 (patch)
treef65c3642d9a10619d9bb58c4938189eef7d67e33
parent7afc45c3ed72672690014dc432edc223b23ae288 (diff)
upstream: Change description of TCPKeepAlive from "inactive" to
"unresponsive" to clarify what it checks for. Patch from jblaine at kickflop.net via github pr#129, ok djm@. OpenBSD-Commit-ID: 3682f8ec7227f5697945daa25d11ce2d933899e9
-rw-r--r--ssh_config.56
-rw-r--r--sshd_config.56
2 files changed, 6 insertions, 6 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 03321432..53cb5abf 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
.\" (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.297 2019/08/02 01:23:19 djm Exp $
-.Dd $Mdocdate: August 2 2019 $
+.\" $OpenBSD: ssh_config.5,v 1.298 2019/08/09 04:24:03 dtucker Exp $
+.Dd $Mdocdate: August 9 2019 $
.Dt SSH_CONFIG 5
.Os
.Sh NAME
@@ -1460,7 +1460,7 @@ The TCP keepalive option enabled by
.Cm TCPKeepAlive
is spoofable.
The server alive mechanism is valuable when the client or
-server depend on knowing when a connection has become inactive.
+server depend on knowing when a connection has become unresponsive.
.Pp
The default value is 3.
If, for example,
diff --git a/sshd_config.5 b/sshd_config.5
index 9b155f6c..e6ae8714 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,8 +33,8 @@
.\" (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.287 2019/07/23 23:06:57 dtucker Exp $
-.Dd $Mdocdate: July 23 2019 $
+.\" $OpenBSD: sshd_config.5,v 1.288 2019/08/09 04:24:03 dtucker Exp $
+.Dd $Mdocdate: August 9 2019 $
.Dt SSHD_CONFIG 5
.Os
.Sh NAME
@@ -512,7 +512,7 @@ The TCP keepalive option enabled by
.Cm TCPKeepAlive
is spoofable.
The client alive mechanism is valuable when the client or
-server depend on knowing when a connection has become inactive.
+server depend on knowing when a connection has become unresponsive.
.Pp
The default value is 3.
If