diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-10-23 05:08:00 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-10-23 16:14:30 +1100 |
commit | b7548b12a6b2b4abf4d057192c353147e0abba08 (patch) | |
tree | dc76477cd371b6197ba840c3a178bfbcf6d7baba /ssh_config.5 | |
parent | 887669ef032d63cf07f53cada216fa8a0c9a7d72 (diff) |
upstream commit
Expose devices allocated for tun/tap forwarding.
At the client, the device may be obtained from a new %T expansion
for LocalCommand.
At the server, the allocated devices will be listed in a
SSH_TUNNEL variable exposed to the environment of any user sessions
started after the tunnel forwarding was established.
ok markus
Upstream-ID: e61e53f8ae80566e9ddc0d67a5df5bdf2f3c9f9e
Diffstat (limited to 'ssh_config.5')
-rw-r--r-- | ssh_config.5 | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index c04701044..4d3fc3425 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.260 2017/10/21 23:06:24 millert Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.261 2017/10/23 05:08:00 djm Exp $ |
37 | .Dd $Mdocdate: October 21 2017 $ | 37 | .Dd $Mdocdate: October 23 2017 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -1713,6 +1713,16 @@ The original remote hostname, as given on the command line. | |||
1713 | The remote port. | 1713 | The remote port. |
1714 | .It %r | 1714 | .It %r |
1715 | The remote username. | 1715 | The remote username. |
1716 | .It \&%T | ||
1717 | The local | ||
1718 | .Xr tun 4 | ||
1719 | or | ||
1720 | .Xr tap 4 | ||
1721 | network interface assigned if | ||
1722 | .Cm Tunnel | ||
1723 | forwarding was requested, or | ||
1724 | .Cm NONE | ||
1725 | otherwise. | ||
1716 | .It %u | 1726 | .It %u |
1717 | The local username. | 1727 | The local username. |
1718 | .El | 1728 | .El |
@@ -1735,7 +1745,7 @@ and | |||
1735 | accept the tokens %%, %d, %h, %l, %r, and %u. | 1745 | accept the tokens %%, %d, %h, %l, %r, and %u. |
1736 | .Pp | 1746 | .Pp |
1737 | .Cm LocalCommand | 1747 | .Cm LocalCommand |
1738 | accepts the tokens %%, %C, %d, %h, %l, %n, %p, %r, and %u. | 1748 | accepts the tokens %%, %C, %d, %h, %l, %n, %p, %r, %T, and %u. |
1739 | .Pp | 1749 | .Pp |
1740 | .Cm ProxyCommand | 1750 | .Cm ProxyCommand |
1741 | accepts the tokens %%, %h, %p, and %r. | 1751 | accepts the tokens %%, %h, %p, and %r. |