diff options
author | millert@openbsd.org <millert@openbsd.org> | 2017-10-21 23:06:24 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-10-23 16:10:08 +1100 |
commit | 887669ef032d63cf07f53cada216fa8a0c9a7d72 (patch) | |
tree | 089b20255da21a489d7bc796a8ee86bd0b8f028f /ssh_config.5 | |
parent | d27bff293cfeb2252f4c7a58babe5ad3262c6c98 (diff) |
upstream commit
Add URI support to ssh, sftp and scp. For example
ssh://user@host or sftp://user@host/path. The connection parameters
described in draft-ietf-secsh-scp-sftp-ssh-uri-04 are not implemented since
the ssh fingerprint format in the draft uses md5 with no way to specify the
hash function type. OK djm@
Upstream-ID: 4ba3768b662d6722de59e6ecb00abf2d4bf9cacc
Diffstat (limited to 'ssh_config.5')
-rw-r--r-- | ssh_config.5 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 96e6904bc..c04701044 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: ssh_config.5,v 1.259 2017/10/18 05:36:59 jmc Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.260 2017/10/21 23:06:24 millert Exp $ |
37 | .Dd $Mdocdate: October 18 2017 $ | 37 | .Dd $Mdocdate: October 21 2017 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -1198,13 +1198,14 @@ For example, the following directive would connect via an HTTP proxy at | |||
1198 | ProxyCommand /usr/bin/nc -X connect -x 192.0.2.0:8080 %h %p | 1198 | ProxyCommand /usr/bin/nc -X connect -x 192.0.2.0:8080 %h %p |
1199 | .Ed | 1199 | .Ed |
1200 | .It Cm ProxyJump | 1200 | .It Cm ProxyJump |
1201 | Specifies one or more jump proxies as | 1201 | Specifies one or more jump proxies as either |
1202 | .Xo | 1202 | .Xo |
1203 | .Sm off | 1203 | .Sm off |
1204 | .Op Ar user No @ | 1204 | .Op Ar user No @ |
1205 | .Ar host | 1205 | .Ar host |
1206 | .Op : Ns Ar port | 1206 | .Op : Ns Ar port |
1207 | .Sm on | 1207 | .Sm on |
1208 | or an ssh URI | ||
1208 | .Xc . | 1209 | .Xc . |
1209 | Multiple proxies may be separated by comma characters and will be visited | 1210 | Multiple proxies may be separated by comma characters and will be visited |
1210 | sequentially. | 1211 | sequentially. |