summaryrefslogtreecommitdiff
path: root/ssh_config.5
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-05-26 12:07:13 +1000
committerDamien Miller <djm@mindrot.org>2005-05-26 12:07:13 +1000
commitdadfd4dd3862df5cebae2f2dc9b7f112321fa85e (patch)
tree6ca13eee37ade1d274999734806b382b1caf742a /ssh_config.5
parentac7a0059e2a2721b7c35ffe77b9ed3d07f19c945 (diff)
- jakob@cvs.openbsd.org 2005/04/26 13:08:37
[ssh.c ssh_config.5] fallback gracefully if client cannot connect to ControlPath. ok djm@
Diffstat (limited to 'ssh_config.5')
-rw-r--r--ssh_config.57
1 files changed, 6 insertions, 1 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 7e48fa65b..d98246aa4 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh_config.5,v 1.50 2005/04/21 06:17:50 djm Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.51 2005/04/26 13:08:37 jakob Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
@@ -270,6 +270,11 @@ to listen for control connections, but require confirmation using the
270program before they are accepted (see 270program before they are accepted (see
271.Xr ssh-add 1 271.Xr ssh-add 1
272for details). 272for details).
273If the
274.Cm ControlPath
275can not be opened,
276.Nm ssh
277will continue without connecting to a master instance.
273.It Cm ControlPath 278.It Cm ControlPath
274Specify the path to the control socket used for connection sharing. 279Specify the path to the control socket used for connection sharing.
275See 280See