From 9c60f24f01cda386a210638b036dd16294ad4b76 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 26 Mar 2010 11:28:35 +1100 Subject: - djm@cvs.openbsd.org 2010/03/26 00:26:58 [ssh.1] mention that -S none disables connection sharing; from Colin Watson --- ChangeLog | 3 +++ ssh.1 | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc6cd5c56..b64f17c87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,9 @@ [servconf.c] from portable: getcwd(NULL, 0) doesn't work on all platforms, so use a stack buffer; ok dtucker@ + - djm@cvs.openbsd.org 2010/03/26 00:26:58 + [ssh.1] + mention that -S none disables connection sharing; from Colin Watson - (djm) [session.c] Allow ChrootDirectory to work on SELinux platforms - set up SELinux execution context before chroot() call. From Russell Coker via Colin watson; bz#1726 ok dtucker@ diff --git a/ssh.1 b/ssh.1 index 3f815b8e7..c03771a3e 100644 --- a/ssh.1 +++ b/ssh.1 @@ -34,8 +34,8 @@ .\" (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.302 2010/03/05 10:28:21 djm Exp $ -.Dd $Mdocdate: March 5 2010 $ +.\" $OpenBSD: ssh.1,v 1.303 2010/03/26 00:26:58 djm Exp $ +.Dd $Mdocdate: March 26 2010 $ .Dt SSH 1 .Os .Sh NAME @@ -558,7 +558,10 @@ argument is the listen port will be dynamically allocated on the server and reported to the client at run time. .It Fl S Ar ctl_path -Specifies the location of a control socket for connection sharing. +Specifies the location of a control socket for connection sharing +or the string +.Dq none +to disable connection sharing. Refer to the description of .Cm ControlPath and -- cgit v1.2.3