summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-07-18 15:02:06 +1000
committerDamien Miller <djm@mindrot.org>2014-07-18 15:02:06 +1000
commit6d57656331bcd754d912950e4a18ad259d596e61 (patch)
tree66d28591a0885054b9bfaf8e2e21a311ac46c4dc
parent7acefbbcbeab725420ea07397ae35992f505f702 (diff)
downloadopenssh-git-6d57656331bcd754d912950e4a18ad259d596e61.tar.gz
- jmc@cvs.openbsd.org 2014/07/16 14:48:57
[ssh.1] add the streamlocal* options to ssh's -o list; millert says they're irrelevant for scp/sftp; ok markus millert
-rw-r--r--ChangeLog5
-rw-r--r--ssh.16
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f3f83afe..4dbbcbad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,11 @@
of the streamlocal patches by William Ahern from:
http://www.25thandclement.com/~william/projects/streamlocal.html
OK djm@ markus@
+ - jmc@cvs.openbsd.org 2014/07/16 14:48:57
+ [ssh.1]
+ add the streamlocal* options to ssh's -o list; millert says they're
+ irrelevant for scp/sftp;
+ ok markus millert
20140717
- (djm) [digest-openssl.c] Preserve array order when disabling digests.
diff --git a/ssh.1 b/ssh.1
index 5e8ebeae..bb486aad 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,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.346 2014/07/03 05:38:17 djm Exp $
-.Dd $Mdocdate: July 3 2014 $
+.\" $OpenBSD: ssh.1,v 1.347 2014/07/16 14:48:57 jmc Exp $
+.Dd $Mdocdate: July 16 2014 $
.Dt SSH 1
.Os
.Sh NAME
@@ -466,6 +466,8 @@ For full details of the options listed below, and their possible values, see
.It SendEnv
.It ServerAliveInterval
.It ServerAliveCountMax
+.It StreamLocalBindMask
+.It StreamLocalBindUnlink
.It StrictHostKeyChecking
.It TCPKeepAlive
.It Tunnel