[openssh-commits] [openssh] 11/19: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 9a82e24b986e3e0dc70849dbb2c19aa6c707b37f
Author: naddy at openbsd.org <naddy at openbsd.org>
Date:   Wed May 3 21:49:18 2017 +0000

    upstream commit
    
    restore mistakenly deleted description of the
    ConnectionAttempts option ok markus@
    
    Upstream-ID: 943002b1b7c470caea3253ba7b7348c359de0348
---
 scp.1        | 5 +++--
 sftp.1       | 3 ++-
 ssh.1        | 3 ++-
 ssh_config.5 | 7 ++++++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/scp.1 b/scp.1
index 9b5229ab..76ce3336 100644
--- a/scp.1
+++ b/scp.1
@@ -8,9 +8,9 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.73 2017/05/02 13:44:51 jmc Exp $
+.\" $OpenBSD: scp.1,v 1.74 2017/05/03 21:49:18 naddy Exp $
 .\"
-.Dd $Mdocdate: May 2 2017 $
+.Dd $Mdocdate: May 3 2017 $
 .Dt SCP 1
 .Os
 .Sh NAME
@@ -130,6 +130,7 @@ For full details of the options listed below, and their possible values, see
 .It CheckHostIP
 .It Ciphers
 .It Compression
+.It ConnectionAttempts
 .It ConnectTimeout
 .It ControlMaster
 .It ControlPath
diff --git a/sftp.1 b/sftp.1
index 5dce807f..c218376f 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.109 2017/05/03 06:32:02 jmc Exp $
+.\" $OpenBSD: sftp.1,v 1.110 2017/05/03 21:49:18 naddy Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -199,6 +199,7 @@ For full details of the options listed below, and their possible values, see
 .It CheckHostIP
 .It Ciphers
 .It Compression
+.It ConnectionAttempts
 .It ConnectTimeout
 .It ControlMaster
 .It ControlPath
diff --git a/ssh.1 b/ssh.1
index b9a85aff..1c5ad741 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,7 +33,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.1,v 1.379 2017/05/03 06:32:02 jmc Exp $
+.\" $OpenBSD: ssh.1,v 1.380 2017/05/03 21:49:18 naddy Exp $
 .Dd $Mdocdate: May 3 2017 $
 .Dt SSH 1
 .Os
@@ -469,6 +469,7 @@ For full details of the options listed below, and their possible values, see
 .It Ciphers
 .It ClearAllForwardings
 .It Compression
+.It ConnectionAttempts
 .It ConnectTimeout
 .It ControlMaster
 .It ControlPath
diff --git a/ssh_config.5 b/ssh_config.5
index e8e51d2c..68fd028e 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,7 +33,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.246 2017/05/03 21:08:09 naddy Exp $
+.\" $OpenBSD: ssh_config.5,v 1.247 2017/05/03 21:49:18 naddy Exp $
 .Dd $Mdocdate: May 3 2017 $
 .Dt SSH_CONFIG 5
 .Os
@@ -455,6 +455,11 @@ The argument must be
 or
 .Cm no
 (the default).
+.It Cm ConnectionAttempts
+Specifies the number of tries (one per second) to make before exiting.
+The argument must be an integer.
+This may be useful in scripts if the connection sometimes fails.
+The default is 1.
 .It Cm ConnectTimeout
 Specifies the timeout (in seconds) used when connecting to the
 SSH server, instead of using the default system TCP timeout.

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.