diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | ssh.1 | 5 | ||||
-rw-r--r-- | ssh_config.5 | 6 |
3 files changed, 9 insertions, 5 deletions
@@ -58,6 +58,9 @@ | |||
58 | rather than have to shuffle data back and forth and enables ssh to use | 58 | rather than have to shuffle data back and forth and enables ssh to use |
59 | getpeername, etc. to obtain address information just like it does with | 59 | getpeername, etc. to obtain address information just like it does with |
60 | regular directly-connected sockets. ok markus@ | 60 | regular directly-connected sockets. ok markus@ |
61 | - jmc@cvs.openbsd.org 2013/08/20 06:56:07 | ||
62 | [ssh.1 ssh_config.5] | ||
63 | some proxyusefdpass tweaks; | ||
61 | 64 | ||
62 | 20130808 | 65 | 20130808 |
63 | - (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt | 66 | - (dtucker) [regress/Makefile regress/test-exec.sh] Don't try to use test -nt |
@@ -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.1,v 1.335 2013/08/14 08:39:27 jmc Exp $ | 36 | .\" $OpenBSD: ssh.1,v 1.336 2013/08/20 06:56:07 jmc Exp $ |
37 | .Dd $Mdocdate: August 14 2013 $ | 37 | .Dd $Mdocdate: August 20 2013 $ |
38 | .Dt SSH 1 | 38 | .Dt SSH 1 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -465,6 +465,7 @@ For full details of the options listed below, and their possible values, see | |||
465 | .It PreferredAuthentications | 465 | .It PreferredAuthentications |
466 | .It Protocol | 466 | .It Protocol |
467 | .It ProxyCommand | 467 | .It ProxyCommand |
468 | .It ProxyUseFdpass | ||
468 | .It PubkeyAuthentication | 469 | .It PubkeyAuthentication |
469 | .It RekeyLimit | 470 | .It RekeyLimit |
470 | .It RemoteForward | 471 | .It RemoteForward |
diff --git a/ssh_config.5 b/ssh_config.5 index e89d694c7..9ddd6b8a6 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -33,7 +33,7 @@ | |||
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.167 2013/08/20 00:11:38 djm Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.168 2013/08/20 06:56:07 jmc Exp $ |
37 | .Dd $Mdocdate: August 20 2013 $ | 37 | .Dd $Mdocdate: August 20 2013 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
@@ -938,10 +938,10 @@ For example, the following directive would connect via an HTTP proxy at | |||
938 | ProxyCommand /usr/bin/nc -X connect -x 192.0.2.0:8080 %h %p | 938 | ProxyCommand /usr/bin/nc -X connect -x 192.0.2.0:8080 %h %p |
939 | .Ed | 939 | .Ed |
940 | .It Cm ProxyUseFdpass | 940 | .It Cm ProxyUseFdpass |
941 | Specifies that the a | 941 | Specifies that |
942 | .Cm ProxyCommand | 942 | .Cm ProxyCommand |
943 | will pass a connected file descriptor back to | 943 | will pass a connected file descriptor back to |
944 | .Nm ssh | 944 | .Xr ssh 1 |
945 | instead of continuing to execute and pass data. | 945 | instead of continuing to execute and pass data. |
946 | The default is | 946 | The default is |
947 | .Dq no . | 947 | .Dq no . |