RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: Add %k to the TOKENs for Match Exec for consistency with 

the other keywords that recently got %k.

OpenBSD-Commit-ID: 1857d1c40f270cbc254fca91e66110641dddcfdb
This commit is contained in:
dtucker@openbsd.org 2020-07-17 07:09:24 +00:00 committed by Darren Tucker
parent 69860769fa
commit a2855c048b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
readconf.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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)) if (r == (negate ? 1 : 0))
this_result = result = 0; this_result = result = 0;
} else if (strcasecmp(attrib, "exec") == 0) { } else if (strcasecmp(attrib, "exec") == 0) {
char *conn_hash_hex; char *conn_hash_hex, *keyalias;
if (gethostname(thishost, sizeof(thishost)) == -1) if (gethostname(thishost, sizeof(thishost)) == -1)
fatal("gethostname: %s", strerror(errno)); 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); (unsigned long long)pw->pw_uid);
conn_hash_hex = ssh_connection_hash(thishost, host, conn_hash_hex = ssh_connection_hash(thishost, host,
portstr, ruser); portstr, ruser);
keyalias = options->host_key_alias ?
options->host_key_alias : host;
cmd = percent_expand(arg, cmd = percent_expand(arg,
"C", conn_hash_hex, "C", conn_hash_hex,
"L", shorthost, "L", shorthost,
"d", pw->pw_dir, "d", pw->pw_dir,
"h", host, "h", host,
"k", keyalias,
"l", thishost, "l", thishost,
"n", original_host, "n", original_host,
"p", portstr, "p", portstr,