diff options
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | ssh_config.5 | 42 |
2 files changed, 27 insertions, 26 deletions
@@ -1,3 +1,12 @@ | |||
1 | 20050331 | ||
2 | - (dtucker) OpenBSD CVS Sync | ||
3 | - jmc@cvs.openbsd.org 2005/03/16 11:10:38 | ||
4 | [ssh_config.5] | ||
5 | get the syntax right for {Local,Remote}Forward; | ||
6 | based on a diff from markus; | ||
7 | problem report from ponraj; | ||
8 | ok dtucker@ markus@ deraadt@ | ||
9 | |||
1 | 20050329 | 10 | 20050329 |
2 | - (dtucker) [contrib/aix/buildbff.sh] Bug #1005: Look up only the user we're | 11 | - (dtucker) [contrib/aix/buildbff.sh] Bug #1005: Look up only the user we're |
3 | interested in which is much faster in large (eg LDAP or NIS) environments. | 12 | interested in which is much faster in large (eg LDAP or NIS) environments. |
@@ -2387,4 +2396,4 @@ | |||
2387 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2396 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2388 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2397 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2389 | 2398 | ||
2390 | $Id: ChangeLog,v 1.3728 2005/03/29 13:24:12 dtucker Exp $ | 2399 | $Id: ChangeLog,v 1.3729 2005/03/31 11:31:10 dtucker Exp $ |
diff --git a/ssh_config.5 b/ssh_config.5 index dc6d6746f..b35753307 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.48 2005/03/12 11:55:03 jmc Exp $ | 37 | .\" $OpenBSD: ssh_config.5,v 1.49 2005/03/16 11:10:38 jmc 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 |
@@ -495,21 +495,17 @@ The default is to use the server specified list. | |||
495 | .It Cm LocalForward | 495 | .It Cm LocalForward |
496 | Specifies that a TCP/IP port on the local machine be forwarded over | 496 | Specifies that a TCP/IP port on the local machine be forwarded over |
497 | the secure channel to the specified host and port from the remote machine. | 497 | the secure channel to the specified host and port from the remote machine. |
498 | The first argument must be a port number, and the second must be | 498 | The first argument must be |
499 | .Xo | ||
500 | .Sm off | 499 | .Sm off |
501 | .Oo Ar bind_address : Oc | 500 | .Oo Ar bind_address : Oc Ar port |
502 | .Ar host : port | ||
503 | .Sm on | 501 | .Sm on |
504 | .Xc . | 502 | and the second argument must be |
503 | .Ar host : Ns Ar hostport . | ||
505 | IPv6 addresses can be specified by enclosing addresses in square brackets or | 504 | IPv6 addresses can be specified by enclosing addresses in square brackets or |
506 | by using an alternative syntax: | 505 | by using an alternative syntax: |
507 | .Sm off | 506 | .Oo Ar bind_address Ns / Oc Ns Ar port |
508 | .Xo | 507 | and |
509 | .Op Ar bind_address No / | 508 | .Ar host Ns / Ns Ar hostport . |
510 | .Ar host No / Ar port | ||
511 | .Xc . | ||
512 | .Sm on | ||
513 | Multiple forwardings may be specified, and additional forwardings can be | 509 | Multiple forwardings may be specified, and additional forwardings can be |
514 | given on the command line. | 510 | given on the command line. |
515 | Only the superuser can forward privileged ports. | 511 | Only the superuser can forward privileged ports. |
@@ -632,21 +628,17 @@ This option applies to protocol version 2 only. | |||
632 | .It Cm RemoteForward | 628 | .It Cm RemoteForward |
633 | Specifies that a TCP/IP port on the remote machine be forwarded over | 629 | Specifies that a TCP/IP port on the remote machine be forwarded over |
634 | the secure channel to the specified host and port from the local machine. | 630 | the secure channel to the specified host and port from the local machine. |
635 | The first argument must be a port number, and the second must be | 631 | The first argument must be |
636 | .Xo | ||
637 | .Sm off | 632 | .Sm off |
638 | .Oo Ar bind_address : Oc | 633 | .Oo Ar bind_address : Oc Ar port |
639 | .Ar host : port | ||
640 | .Sm on | ||
641 | .Xc . | ||
642 | IPv6 addresses can be specified by enclosing any addresses in square brackets | ||
643 | or by using the alternative syntax: | ||
644 | .Sm off | ||
645 | .Xo | ||
646 | .Op Ar bind_address No / | ||
647 | .Ar host No / Ar port | ||
648 | .Xc . | ||
649 | .Sm on | 634 | .Sm on |
635 | and the second argument must be | ||
636 | .Ar host : Ns Ar hostport . | ||
637 | IPv6 addresses can be specified by enclosing addresses in square brackets | ||
638 | or by using an alternative syntax: | ||
639 | .Oo Ar bind_address Ns / Oc Ns Ar port | ||
640 | and | ||
641 | .Ar host Ns / Ns Ar hostport . | ||
650 | Multiple forwardings may be specified, and additional | 642 | Multiple forwardings may be specified, and additional |
651 | forwardings can be given on the command line. | 643 | forwardings can be given on the command line. |
652 | Only the superuser can forward privileged ports. | 644 | Only the superuser can forward privileged ports. |