diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-11-23 05:08:07 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-11-23 16:09:12 +1100 |
| commit | 9e34e0c59ab04514f9de9934a772283f7f372afe (patch) | |
| tree | 4306e1438b1efe0283b635d4d4ed1256cff0fe59 /ssh_config.5 | |
| parent | 4da58d58736b065b1182b563d10ad6765d811c6d (diff) | |
| download | openssh-git-9e34e0c59ab04514f9de9934a772283f7f372afe.tar.gz | |
upstream: add a ssh_config "Match final" predicate
Matches in same pass as "Match canonical" but doesn't require
hostname canonicalisation be enabled. bz#2906 ok markus
OpenBSD-Commit-ID: fba1dfe9f6e0cabcd0e2b3be13f7a434199beffa
Diffstat (limited to 'ssh_config.5')
| -rw-r--r-- | ssh_config.5 | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/ssh_config.5 b/ssh_config.5 index 4d5b01d3..58a5fa1c 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.286 2018/10/03 06:38:35 djm Exp $ -.Dd $Mdocdate: October 3 2018 $ +.\" $OpenBSD: ssh_config.5,v 1.287 2018/11/23 05:08:07 djm Exp $ +.Dd $Mdocdate: November 23 2018 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -139,6 +139,7 @@ or the single token which always matches. The available criteria keywords are: .Cm canonical , +.Cm final , .Cm exec , .Cm host , .Cm originalhost , @@ -148,12 +149,15 @@ and The .Cm all criteria must appear alone or immediately after -.Cm canonical . +.Cm canonical +or +.Cm final . Other criteria may be combined arbitrarily. All criteria but .Cm all -and .Cm canonical +and +.Cm final require an argument. Criteria may be negated by prepending an exclamation mark .Pq Sq !\& . @@ -166,6 +170,20 @@ after hostname canonicalization (see the option.) This may be useful to specify conditions that work with canonical host names only. +.Pp +The +.Cm final +keyword requests that the configuration be re-parsed (regardless of whether +.Cm CanonicalizeHostname +is enabled), and matches only during this final pass. +If +.Cm CanonicalizeHostname +is enabled, then +.Cm canonical +and +.Cm final +match during the same pass. +.Pp The .Cm exec keyword executes the specified command under the user's shell. |