summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-05-26 12:13:56 +1000
committerDamien Miller <djm@mindrot.org>2005-05-26 12:13:56 +1000
commitebcfedce85310aba939049b29804bf68697c9a1f (patch)
tree403dfc28ba25d87d7073cd50eddade94b659fd2d
parent459735a0c60607ecf07c3e5d6aa0c599cab8bd3b (diff)
- djm@cvs.openbsd.org 2005/05/20 10:50:55
[ssh_config.5] give a ProxyCommand example using nc(1), with and ok jmc@
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.511
2 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 40b28d2d9..28a7d082f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -65,6 +65,9 @@
65 - djm@cvs.openbsd.org 2005/05/19 02:42:26 65 - djm@cvs.openbsd.org 2005/05/19 02:42:26
66 [includes.h] 66 [includes.h]
67 fix cast, from grunk AT pestilenz.org 67 fix cast, from grunk AT pestilenz.org
68 - djm@cvs.openbsd.org 2005/05/20 10:50:55
69 [ssh_config.5]
70 give a ProxyCommand example using nc(1), with and ok jmc@
68 71
6920050524 7220050524
70 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] 73 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
@@ -2564,4 +2567,4 @@
2564 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2567 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2565 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2568 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2566 2569
2567$Id: ChangeLog,v 1.3780 2005/05/26 02:13:42 djm Exp $ 2570$Id: ChangeLog,v 1.3781 2005/05/26 02:13:56 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index d98246aa4..52a8dff4c 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
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_config.5,v 1.51 2005/04/26 13:08:37 jakob Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.52 2005/05/20 10:50:55 djm Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
@@ -621,6 +621,15 @@ Note that
621.Cm CheckHostIP 621.Cm CheckHostIP
622is not available for connects with a proxy command. 622is not available for connects with a proxy command.
623.Pp 623.Pp
624This directive is useful in conjunction with
625.Xr nc 1
626and its proxy support.
627For example, the following directive would connect via a HTTP proxy at
628192.0.2.0:
629.Bd -literal -offset 3n
630ProxyCommand /usr/bin/nc -X connect -x 192.0.2.0:8080 %h %p
631.Ed
632.Pp
624.It Cm PubkeyAuthentication 633.It Cm PubkeyAuthentication
625Specifies whether to try public key authentication. 634Specifies whether to try public key authentication.
626The argument to this keyword must be 635The argument to this keyword must be