diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2020-04-03 02:27:12 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-04-03 13:33:37 +1100 |
commit | ed833da176611a39d3376d62154eb88eb440d31c (patch) | |
tree | f9fe72b08478c0ad599538f9dbfb94e582e93a93 /ssh_config.5 | |
parent | 6ec7457171468da2bbd908b8cd63d298b0e049ea (diff) |
upstream: Make with config keywords support which
percent_expansions more consistent. - %C is moved into its own function and
added to Match Exec. - move the common (global) options into a macro. This
is ugly but it's the least-ugly way I could come up with. - move
IdentityAgent and ForwardAgent percent expansion to before the config dump
to make it regression-testable. - document all of the above
ok jmc@ for man page bits, "makes things less terrible" djm@ for the rest.
OpenBSD-Commit-ID: 4b65664bd6d8ae2a9afaf1a2438ddd1b614b1d75
Diffstat (limited to 'ssh_config.5')
-rw-r--r-- | ssh_config.5 | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 06a32d314..9d89c13aa 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.322 2020/02/07 03:54:44 dtucker Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.323 2020/04/03 02:27:12 dtucker Exp $ |
37 | .Dd $Mdocdate: February 7 2020 $ | 37 | .Dd $Mdocdate: April 3 2020 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -1845,31 +1845,23 @@ otherwise. | |||
1845 | The local username. | 1845 | The local username. |
1846 | .El | 1846 | .El |
1847 | .Pp | 1847 | .Pp |
1848 | .Cm Match exec | 1848 | .Cm Match exec , |
1849 | accepts the tokens %%, %h, %i, %L, %l, %n, %p, %r, and %u. | 1849 | .Cm CertificateFile , |
1850 | .Pp | 1850 | .Cm ControlPath , |
1851 | .Cm CertificateFile | 1851 | .Cm IdentityAgent , |
1852 | accepts the tokens %%, %d, %h, %i, %l, %r, and %u. | 1852 | .Cm IdentityFile , |
1853 | .Pp | 1853 | and |
1854 | .Cm ControlPath | 1854 | .Cm RemoteCommand |
1855 | accepts the tokens %%, %C, %h, %i, %L, %l, %n, %p, %r, and %u. | 1855 | accept the tokens %%, %C, %d, %h, %i, %L, %l, %n, %p, %r, and %u. |
1856 | .Pp | 1856 | .Pp |
1857 | .Cm Hostname | 1857 | .Cm Hostname |
1858 | accepts the tokens %% and %h. | 1858 | accepts the tokens %% and %h. |
1859 | .Pp | 1859 | .Pp |
1860 | .Cm IdentityAgent | ||
1861 | and | ||
1862 | .Cm IdentityFile | ||
1863 | accept the tokens %%, %d, %h, %i, %l, %r, and %u. | ||
1864 | .Pp | ||
1865 | .Cm LocalCommand | 1860 | .Cm LocalCommand |
1866 | accepts the tokens %%, %C, %d, %h, %i, %l, %n, %p, %r, %T, and %u. | 1861 | accepts all tokens. |
1867 | .Pp | 1862 | .Pp |
1868 | .Cm ProxyCommand | 1863 | .Cm ProxyCommand |
1869 | accepts the tokens %%, %h, %n, %p, and %r. | 1864 | accepts the tokens %%, %h, %n, %p, and %r. |
1870 | .Pp | ||
1871 | .Cm RemoteCommand | ||
1872 | accepts the tokens %%, %C, %d, %h, %i, %l, %n, %p, %r, and %u. | ||
1873 | .Sh FILES | 1865 | .Sh FILES |
1874 | .Bl -tag -width Ds | 1866 | .Bl -tag -width Ds |
1875 | .It Pa ~/.ssh/config | 1867 | .It Pa ~/.ssh/config |