summaryrefslogtreecommitdiff
path: root/ssh_config.5
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-09-13 04:07:42 +0000
committerDamien Miller <djm@mindrot.org>2019-09-13 14:09:21 +1000
commit2ce1d11600e13bee0667d6b717ffcc18a057b821 (patch)
treeb02363f86a3a8daf808c2f45d0d37b2ed620b872 /ssh_config.5
parentdf780114278f406ef7cb2278802a2660092fff09 (diff)
upstream: clarify that ConnectTimeout applies both to the TCP
connection and to the protocol handshake/KEX. From Jean-Charles Longuet via Github PR140 OpenBSD-Commit-ID: ce1766abc6da080f0d88c09c2c5585a32b2256bf
Diffstat (limited to 'ssh_config.5')
-rw-r--r--ssh_config.58
1 files changed, 4 insertions, 4 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index e114b1dfe..b10c55492 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: ssh_config.5,v 1.301 2019/09/06 14:45:34 naddy Exp $ 36.\" $OpenBSD: ssh_config.5,v 1.302 2019/09/13 04:07:42 djm Exp $
37.Dd $Mdocdate: September 6 2019 $ 37.Dd $Mdocdate: September 13 2019 $
38.Dt SSH_CONFIG 5 38.Dt SSH_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -489,8 +489,8 @@ The default is 1.
489.It Cm ConnectTimeout 489.It Cm ConnectTimeout
490Specifies the timeout (in seconds) used when connecting to the 490Specifies the timeout (in seconds) used when connecting to the
491SSH server, instead of using the default system TCP timeout. 491SSH server, instead of using the default system TCP timeout.
492This value is used only when the target is down or really unreachable, 492This timeout is applied both to establishing the connection and to performing
493not when it refuses the connection. 493the initial SSH protocol handshake and key exchange.
494.It Cm ControlMaster 494.It Cm ControlMaster
495Enables the sharing of multiple sessions over a single network connection. 495Enables the sharing of multiple sessions over a single network connection.
496When set to 496When set to