- djm@cvs.openbsd.org 2010/03/26 00:26:58

[ssh.1]
     mention that -S none disables connection sharing; from Colin Watson
This commit is contained in:
Damien Miller 2010-03-26 11:28:35 +11:00
parent df08341060
commit 9c60f24f01
2 changed files with 9 additions and 3 deletions

View File

@ -8,6 +8,9 @@
[servconf.c] [servconf.c]
from portable: getcwd(NULL, 0) doesn't work on all platforms, so from portable: getcwd(NULL, 0) doesn't work on all platforms, so
use a stack buffer; ok dtucker@ 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 - - (djm) [session.c] Allow ChrootDirectory to work on SELinux platforms -
set up SELinux execution context before chroot() call. From Russell set up SELinux execution context before chroot() call. From Russell
Coker via Colin watson; bz#1726 ok dtucker@ Coker via Colin watson; bz#1726 ok dtucker@

9
ssh.1
View File

@ -34,8 +34,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.1,v 1.302 2010/03/05 10:28:21 djm Exp $ .\" $OpenBSD: ssh.1,v 1.303 2010/03/26 00:26:58 djm Exp $
.Dd $Mdocdate: March 5 2010 $ .Dd $Mdocdate: March 26 2010 $
.Dt SSH 1 .Dt SSH 1
.Os .Os
.Sh NAME .Sh NAME
@ -558,7 +558,10 @@ argument is
the listen port will be dynamically allocated on the server and reported the listen port will be dynamically allocated on the server and reported
to the client at run time. to the client at run time.
.It Fl S Ar ctl_path .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 Refer to the description of
.Cm ControlPath .Cm ControlPath
and and