diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-06-01 03:33:53 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-06-01 13:35:59 +1000 |
commit | 9c935dd9bf05628826ad2495d3e8bdf3d3271c21 (patch) | |
tree | 35ccf63e51d3daf2fa927b843d813295e41e96e6 /ssh_config.5 | |
parent | d8748b91d1d6c108c0c260ed41fa55f37b9ef34b (diff) |
upstream: make UID available as a %-expansion everywhere that the
username is available currently. In the client this is via %i, in the server
%U (since %i was already used in the client in some places for this, but used
for something different in the server); bz#2870, ok dtucker@
OpenBSD-Commit-ID: c7e912b0213713316cb55db194b3a6415b3d4b95
Diffstat (limited to 'ssh_config.5')
-rw-r--r-- | ssh_config.5 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index bcd18a872..94c12bdda 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.273 2018/04/10 00:10:49 djm Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.274 2018/06/01 03:33:53 djm Exp $ |
37 | .Dd $Mdocdate: April 10 2018 $ | 37 | .Dd $Mdocdate: June 1 2018 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -1743,10 +1743,10 @@ The local username. | |||
1743 | .El | 1743 | .El |
1744 | .Pp | 1744 | .Pp |
1745 | .Cm Match exec | 1745 | .Cm Match exec |
1746 | accepts the tokens %%, %h, %L, %l, %n, %p, %r, and %u. | 1746 | accepts the tokens %%, %h, %i, %L, %l, %n, %p, %r, and %u. |
1747 | .Pp | 1747 | .Pp |
1748 | .Cm CertificateFile | 1748 | .Cm CertificateFile |
1749 | accepts the tokens %%, %d, %h, %l, %r, and %u. | 1749 | accepts the tokens %%, %d, %h, %i %l, %r, and %u. |
1750 | .Pp | 1750 | .Pp |
1751 | .Cm ControlPath | 1751 | .Cm ControlPath |
1752 | accepts the tokens %%, %C, %h, %i, %L, %l, %n, %p, %r, and %u. | 1752 | accepts the tokens %%, %C, %h, %i, %L, %l, %n, %p, %r, and %u. |
@@ -1757,16 +1757,16 @@ accepts the tokens %% and %h. | |||
1757 | .Cm IdentityAgent | 1757 | .Cm IdentityAgent |
1758 | and | 1758 | and |
1759 | .Cm IdentityFile | 1759 | .Cm IdentityFile |
1760 | accept the tokens %%, %d, %h, %l, %r, and %u. | 1760 | accept the tokens %%, %d, %h, %i %l, %r, and %u. |
1761 | .Pp | 1761 | .Pp |
1762 | .Cm LocalCommand | 1762 | .Cm LocalCommand |
1763 | accepts the tokens %%, %C, %d, %h, %l, %n, %p, %r, %T, and %u. | 1763 | accepts the tokens %%, %C, %d, %h, %i %l, %n, %p, %r, %T, and %u. |
1764 | .Pp | 1764 | .Pp |
1765 | .Cm ProxyCommand | 1765 | .Cm ProxyCommand |
1766 | accepts the tokens %%, %h, %p, and %r. | 1766 | accepts the tokens %%, %h, %p, and %r. |
1767 | .Pp | 1767 | .Pp |
1768 | .Cm RemoteCommand | 1768 | .Cm RemoteCommand |
1769 | accepts the tokens %%, %C, %d, %h, %l, %n, %p, %r, and %u. | 1769 | accepts the tokens %%, %C, %d, %h, %i, %l, %n, %p, %r, and %u. |
1770 | .Sh FILES | 1770 | .Sh FILES |
1771 | .Bl -tag -width Ds | 1771 | .Bl -tag -width Ds |
1772 | .It Pa ~/.ssh/config | 1772 | .It Pa ~/.ssh/config |