summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2005-10-30 01:23:20 +0000
committerDamien Miller <djm@cvs.openbsd.org>2005-10-30 01:23:20 +0000
commita88be7dca6d06ec3b589cea5315442ba2ae49af0 (patch)
treed94d3a959d16aec0dcc0342e4cf20833a4d4eba1 /usr.bin
parentca133406cd9fcb8f4702f5ae81126aa2f8a177ba (diff)
mention control socket fallback behaviour, reported by tryponraj AT gmail.com
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/ssh_config.58
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
index 2e38be950c8..fcbf1e594f1 100644
--- a/usr.bin/ssh/ssh_config.5
+++ b/usr.bin/ssh/ssh_config.5
@@ -34,7 +34,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.62 2005/09/19 11:37:34 djm Exp $
+.\" $OpenBSD: ssh_config.5,v 1.63 2005/10/30 01:23:19 djm Exp $
.Dd September 25, 1999
.Dt SSH_CONFIG 5
.Os
@@ -263,8 +263,10 @@ with
set to
.Dq no
(the default).
-These sessions will reuse the master instance's network connection rather
-than initiating new ones.
+These sessions will try to reuse the master instance's network connection
+rather than initiating new ones, but will fall back to connecting normally
+if the control socket does not exist, or is not listening.
+.Pp
Setting this to
.Dq ask
will cause