tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
djm@openbsd.org 2019-09-13 04:07:42 +00:00 committed by Damien Miller
parent df78011427
commit 2ce1d11600
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ssh_config.5
View File

@ -33,8 +33,8 @@
.\" (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.301 2019/09/06 14:45:34 naddy Exp $ .\" $OpenBSD: ssh_config.5,v 1.302 2019/09/13 04:07:42 djm Exp $
.Dd $Mdocdate: September 6 2019 $ .Dd $Mdocdate: September 13 2019 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -489,8 +489,8 @@ The default is 1.
.It Cm ConnectTimeout .It Cm ConnectTimeout
Specifies the timeout (in seconds) used when connecting to the Specifies the timeout (in seconds) used when connecting to the
SSH server, instead of using the default system TCP timeout. SSH server, instead of using the default system TCP timeout.
This value is used only when the target is down or really unreachable, This timeout is applied both to establishing the connection and to performing
not when it refuses the connection. the initial SSH protocol handshake and key exchange.
.It Cm ControlMaster .It Cm ControlMaster
Enables the sharing of multiple sessions over a single network connection. Enables the sharing of multiple sessions over a single network connection.
When set to When set to