From 6d57656331bcd754d912950e4a18ad259d596e61 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 18 Jul 2014 15:02:06 +1000 Subject: [PATCH] - 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 --- ChangeLog | 5 +++++ ssh.1 | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f3f83afe1..4dbbcbad4 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 5e8ebeae7..bb486aad6 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