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) | |
| download | openssh-git-ed833da176611a39d3376d62154eb88eb440d31c.tar.gz | |
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 06a32d31..9d89c13a 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.322 2020/02/07 03:54:44 dtucker Exp $ -.Dd $Mdocdate: February 7 2020 $ +.\" $OpenBSD: ssh_config.5,v 1.323 2020/04/03 02:27:12 dtucker Exp $ +.Dd $Mdocdate: April 3 2020 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -1845,31 +1845,23 @@ otherwise. The local username. .El .Pp -.Cm Match exec -accepts the tokens %%, %h, %i, %L, %l, %n, %p, %r, and %u. -.Pp -.Cm CertificateFile -accepts the tokens %%, %d, %h, %i, %l, %r, and %u. -.Pp -.Cm ControlPath -accepts the tokens %%, %C, %h, %i, %L, %l, %n, %p, %r, and %u. +.Cm Match exec , +.Cm CertificateFile , +.Cm ControlPath , +.Cm IdentityAgent , +.Cm IdentityFile , +and +.Cm RemoteCommand +accept the tokens %%, %C, %d, %h, %i, %L, %l, %n, %p, %r, and %u. .Pp .Cm Hostname accepts the tokens %% and %h. .Pp -.Cm IdentityAgent -and -.Cm IdentityFile -accept the tokens %%, %d, %h, %i, %l, %r, and %u. -.Pp .Cm LocalCommand -accepts the tokens %%, %C, %d, %h, %i, %l, %n, %p, %r, %T, and %u. +accepts all tokens. .Pp .Cm ProxyCommand accepts the tokens %%, %h, %n, %p, and %r. -.Pp -.Cm RemoteCommand -accepts the tokens %%, %C, %d, %h, %i, %l, %n, %p, %r, and %u. .Sh FILES .Bl -tag -width Ds .It Pa ~/.ssh/config |