upstream commit

mux-related manual tweaks

mention ControlPersist=0 is the same as ControlPersist=yes

recommend that ControlPath sockets be placed in a og-w directory
This commit is contained in:
djm@openbsd.org 2014-11-10 22:25:49 +00:00 committed by Damien Miller
parent 0e4cff5f35
commit fc30256136
1 changed files with 7 additions and 4 deletions

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.194 2014/10/09 06:21:31 jmc Exp $ .\" $OpenBSD: ssh_config.5,v 1.195 2014/11/10 22:25:49 djm Exp $
.Dd $Mdocdate: October 9 2014 $ .Dd $Mdocdate: November 10 2014 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -537,7 +537,8 @@ by a hash of the concatenation: %l%h%p%r.
It is recommended that any It is recommended that any
.Cm ControlPath .Cm ControlPath
used for opportunistic connection sharing include used for opportunistic connection sharing include
at least %h, %p, and %r (or alternatively %C). at least %h, %p, and %r (or alternatively %C) and be placed in a directory
that is not writable by other users.
This ensures that shared connections are uniquely identified. This ensures that shared connections are uniquely identified.
.It Cm ControlPersist .It Cm ControlPersist
When used in conjunction with When used in conjunction with
@ -550,7 +551,9 @@ If set to
then the master connection will not be placed into the background, then the master connection will not be placed into the background,
and will close as soon as the initial client connection is closed. and will close as soon as the initial client connection is closed.
If set to If set to
.Dq yes , .Dq yes
or
.Dq 0 ,
then the master connection will remain in the background indefinitely then the master connection will remain in the background indefinitely
(until killed or closed via a mechanism such as the (until killed or closed via a mechanism such as the
.Xr ssh 1 .Xr ssh 1