From b3bfbb735583ed13d6141bba61bae0dc65fec291 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sat, 5 Nov 2005 15:11:48 +1100 Subject: - djm@cvs.openbsd.org 2005/10/30 01:23:19 [ssh_config.5] mention control socket fallback behaviour, reported by tryponraj AT gmail.com --- ChangeLog | 6 +++++- ssh_config.5 | 8 +++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e546e1f4..533062b91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,10 @@ - stevesk@cvs.openbsd.org 2005/10/17 14:13:35 [dns.c dns.h] more cleanups; ok jakob@ + - djm@cvs.openbsd.org 2005/10/30 01:23:19 + [ssh_config.5] + mention control socket fallback behaviour, reported by + tryponraj AT gmail.com 20051102 - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). @@ -3187,4 +3191,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3939 2005/11/05 04:11:15 djm Exp $ +$Id: ChangeLog,v 1.3940 2005/11/05 04:11:48 djm Exp $ diff --git a/ssh_config.5 b/ssh_config.5 index 2e38be950..fcbf1e594 100644 --- a/ssh_config.5 +++ b/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 -- cgit v1.2.3