summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2013-08-20 06:56:08 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2013-08-20 06:56:08 +0000
commitfbf1196325979f1b58eb465306a1b09159e81db3 (patch)
tree562acd517c61ebe953a7b38854ba88d233563f75
parent66a69847a18e6a34057db7cbb1af591b98088b39 (diff)
some proxyusefdpass tweaks;
-rw-r--r--usr.bin/ssh/ssh.15
-rw-r--r--usr.bin/ssh/ssh_config.56
2 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1
index 09c9dbcbdad..22765401678 100644
--- a/usr.bin/ssh/ssh.1
+++ b/usr.bin/ssh/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.335 2013/08/14 08:39:27 jmc Exp $
-.Dd $Mdocdate: August 14 2013 $
+.\" $OpenBSD: ssh.1,v 1.336 2013/08/20 06:56:07 jmc Exp $
+.Dd $Mdocdate: August 20 2013 $
.Dt SSH 1
.Os
.Sh NAME
@@ -465,6 +465,7 @@ For full details of the options listed below, and their possible values, see
.It PreferredAuthentications
.It Protocol
.It ProxyCommand
+.It ProxyUseFdpass
.It PubkeyAuthentication
.It RekeyLimit
.It RemoteForward
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
index e89d694c76a..9ddd6b8a6b1 100644
--- a/usr.bin/ssh/ssh_config.5
+++ b/usr.bin/ssh/ssh_config.5
@@ -33,7 +33,7 @@
.\" (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_config.5,v 1.167 2013/08/20 00:11:38 djm Exp $
+.\" $OpenBSD: ssh_config.5,v 1.168 2013/08/20 06:56:07 jmc Exp $
.Dd $Mdocdate: August 20 2013 $
.Dt SSH_CONFIG 5
.Os
@@ -938,10 +938,10 @@ For example, the following directive would connect via an HTTP proxy at
ProxyCommand /usr/bin/nc -X connect -x 192.0.2.0:8080 %h %p
.Ed
.It Cm ProxyUseFdpass
-Specifies that the a
+Specifies that
.Cm ProxyCommand
will pass a connected file descriptor back to
-.Nm ssh
+.Xr ssh 1
instead of continuing to execute and pass data.
The default is
.Dq no .