diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2015-09-11 03:47:28 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-09-16 17:52:04 +1000 |
| commit | 674b3b68c1d36b2562324927cd03857b565e05e8 (patch) | |
| tree | 7519039660a2adce9b9cb463dbb3298a8e1e9d29 /ssh_config.5 | |
| parent | c0f55db7ee00c8202b05cb4b9ad4ce72cc45df41 (diff) | |
upstream commit
expand %i in ControlPath to UID; bz#2449
patch from Christian Hesse w/ feedback from dtucker@
Upstream-ID: 2ba8d303e555a84e2f2165ab4b324b41e80ab925
Diffstat (limited to 'ssh_config.5')
| -rw-r--r-- | ssh_config.5 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 9c6c2bdac..a4c85217a 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.217 2015/09/04 06:40:45 jmc Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.218 2015/09/11 03:47:28 djm Exp $ |
| 37 | .Dd $Mdocdate: September 4 2015 $ | 37 | .Dd $Mdocdate: September 11 2015 $ |
| 38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
| 39 | .Os | 39 | .Os |
| 40 | .Sh NAME | 40 | .Sh NAME |
| @@ -538,7 +538,9 @@ the destination port, | |||
| 538 | .Ql %r | 538 | .Ql %r |
| 539 | by the remote login username, | 539 | by the remote login username, |
| 540 | .Ql %u | 540 | .Ql %u |
| 541 | by the username of the user running | 541 | by the username and |
| 542 | .Ql %i | ||
| 543 | by the numeric user id (uid) of the user running | ||
| 542 | .Xr ssh 1 , and | 544 | .Xr ssh 1 , and |
| 543 | .Ql \&%C | 545 | .Ql \&%C |
| 544 | by a hash of the concatenation: %l%h%p%r. | 546 | by a hash of the concatenation: %l%h%p%r. |