summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh.19
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 @@
8 [servconf.c] 8 [servconf.c]
9 from portable: getcwd(NULL, 0) doesn't work on all platforms, so 9 from portable: getcwd(NULL, 0) doesn't work on all platforms, so
10 use a stack buffer; ok dtucker@ 10 use a stack buffer; ok dtucker@
11 - djm@cvs.openbsd.org 2010/03/26 00:26:58
12 [ssh.1]
13 mention that -S none disables connection sharing; from Colin Watson
11 - (djm) [session.c] Allow ChrootDirectory to work on SELinux platforms - 14 - (djm) [session.c] Allow ChrootDirectory to work on SELinux platforms -
12 set up SELinux execution context before chroot() call. From Russell 15 set up SELinux execution context before chroot() call. From Russell
13 Coker via Colin watson; bz#1726 ok dtucker@ 16 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 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh.1,v 1.302 2010/03/05 10:28:21 djm Exp $ 37.\" $OpenBSD: ssh.1,v 1.303 2010/03/26 00:26:58 djm Exp $
38.Dd $Mdocdate: March 5 2010 $ 38.Dd $Mdocdate: March 26 2010 $
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -558,7 +558,10 @@ argument is
558the listen port will be dynamically allocated on the server and reported 558the listen port will be dynamically allocated on the server and reported
559to the client at run time. 559to the client at run time.
560.It Fl S Ar ctl_path 560.It Fl S Ar ctl_path
561Specifies the location of a control socket for connection sharing. 561Specifies the location of a control socket for connection sharing
562or the string
563.Dq none
564to disable connection sharing.
562Refer to the description of 565Refer to the description of
563.Cm ControlPath 566.Cm ControlPath
564and 567and