- 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
This commit is contained in:
Damien Miller 2014-07-18 15:02:06 +10:00
parent 7acefbbcbe
commit 6d57656331
2 changed files with 9 additions and 2 deletions

View File

@ -14,6 +14,11 @@
of the streamlocal patches by William Ahern from: of the streamlocal patches by William Ahern from:
http://www.25thandclement.com/~william/projects/streamlocal.html http://www.25thandclement.com/~william/projects/streamlocal.html
OK djm@ markus@ 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 20140717
- (djm) [digest-openssl.c] Preserve array order when disabling digests. - (djm) [digest-openssl.c] Preserve array order when disabling digests.

6
ssh.1
View File

@ -33,8 +33,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.346 2014/07/03 05:38:17 djm Exp $ .\" $OpenBSD: ssh.1,v 1.347 2014/07/16 14:48:57 jmc Exp $
.Dd $Mdocdate: July 3 2014 $ .Dd $Mdocdate: July 16 2014 $
.Dt SSH 1 .Dt SSH 1
.Os .Os
.Sh NAME .Sh NAME
@ -466,6 +466,8 @@ For full details of the options listed below, and their possible values, see
.It SendEnv .It SendEnv
.It ServerAliveInterval .It ServerAliveInterval
.It ServerAliveCountMax .It ServerAliveCountMax
.It StreamLocalBindMask
.It StreamLocalBindUnlink
.It StrictHostKeyChecking .It StrictHostKeyChecking
.It TCPKeepAlive .It TCPKeepAlive
.It Tunnel .It Tunnel