diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2020-07-17 03:43:42 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-07-17 13:52:46 +1000 |
commit | 8df5774a42d2eaffe057bd7f293fc6a4b1aa411c (patch) | |
tree | 16e1028b667e7f3fc41034da48367165e1110741 /ssh_config.5 | |
parent | c4f239944a4351810fd317edf408bdcd5c0102d9 (diff) |
upstream: Add a '%k' TOKEN that expands to the effective HostKey of
the destination. This allows, eg, keeping host keys in individual files
using "UserKnownHostsFile ~/.ssh/known_hosts.d/%k". bz#1654, ok djm@, jmc@
(man page bits)
OpenBSD-Commit-ID: 7084d723c9cc987a5c47194219efd099af5beadc
Diffstat (limited to 'ssh_config.5')
-rw-r--r-- | ssh_config.5 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index fce59d13a..523ee6973 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.329 2020/07/17 03:23:10 dtucker Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.330 2020/07/17 03:43:42 dtucker Exp $ |
37 | .Dd $Mdocdate: July 17 2020 $ | 37 | .Dd $Mdocdate: July 17 2020 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
@@ -1850,6 +1850,9 @@ Local user's home directory. | |||
1850 | The remote hostname. | 1850 | The remote hostname. |
1851 | .It %i | 1851 | .It %i |
1852 | The local user ID. | 1852 | The local user ID. |
1853 | .It %k | ||
1854 | The host key alias if specified, otherwise the orignal remote hostname given | ||
1855 | on the command line. | ||
1853 | .It %L | 1856 | .It %L |
1854 | The local hostname. | 1857 | The local hostname. |
1855 | .It %l | 1858 | .It %l |