diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2020-07-17 07:09:24 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2020-07-17 18:03:28 +1000 |
| commit | a2855c048b3f4b17d8787bd3f24232ec0cd79abe (patch) | |
| tree | d63452d09b0861afd8ec9c08f3bb79b7a432be0d /readconf.c | |
| parent | 69860769fa9f4529d8612ec055ae11912f7344cf (diff) | |
| download | openssh-git-a2855c048b3f4b17d8787bd3f24232ec0cd79abe.tar.gz | |
upstream: Add %k to the TOKENs for Match Exec for consistency with
the other keywords that recently got %k.
OpenBSD-Commit-ID: 1857d1c40f270cbc254fca91e66110641dddcfdb
Diffstat (limited to 'readconf.c')
| -rw-r--r-- | readconf.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.c,v 1.332 2020/07/05 23:59:45 djm Exp $ */ +/* $OpenBSD: readconf.c,v 1.333 2020/07/17 07:09:24 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -664,7 +664,7 @@ match_cfg_line(Options *options, char **condition, struct passwd *pw, if (r == (negate ? 1 : 0)) this_result = result = 0; } else if (strcasecmp(attrib, "exec") == 0) { - char *conn_hash_hex; + char *conn_hash_hex, *keyalias; if (gethostname(thishost, sizeof(thishost)) == -1) fatal("gethostname: %s", strerror(errno)); @@ -675,12 +675,15 @@ match_cfg_line(Options *options, char **condition, struct passwd *pw, (unsigned long long)pw->pw_uid); conn_hash_hex = ssh_connection_hash(thishost, host, portstr, ruser); + keyalias = options->host_key_alias ? + options->host_key_alias : host; cmd = percent_expand(arg, "C", conn_hash_hex, "L", shorthost, "d", pw->pw_dir, "h", host, + "k", keyalias, "l", thishost, "n", original_host, "p", portstr, |