tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2013/10/23 03:03:07 

[readconf.c]
     Hostname may have %h sequences that should be expanded prior to Match
     evaluation; spotted by Iain Morgan
This commit is contained in:
Damien Miller 2013-10-23 16:30:51 +11:00
parent 8e5a67f469
commit 084bcd24e9
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -15,6 +15,10 @@
- jmc@cvs.openbsd.org 2013/10/20 18:00:13 - jmc@cvs.openbsd.org 2013/10/20 18:00:13
[ssh_config.5] [ssh_config.5]
tweak the "exec" description, as worded by djm; tweak the "exec" description, as worded by djm;
- djm@cvs.openbsd.org 2013/10/23 03:03:07
[readconf.c]
Hostname may have %h sequences that should be expanded prior to Match
evaluation; spotted by Iain Morgan
20131018 20131018
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync

20
readconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: readconf.c,v 1.210 2013/10/20 06:19:27 djm Exp $ */ /* $OpenBSD: readconf.c,v 1.211 2013/10/23 03:03:07 djm 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
@ -457,8 +457,8 @@ static int
match_cfg_line(Options *options, char **condition, struct passwd *pw, match_cfg_line(Options *options, char **condition, struct passwd *pw,
const char *host_arg, const char *filename, int linenum) const char *host_arg, const char *filename, int linenum)
{ {
char *arg, *attrib, *cmd, *cp = *condition; char *arg, *attrib, *cmd, *cp = *condition, *host;
const char *ruser, *host; const char *ruser;
int r, port, result = 1; int r, port, result = 1;
size_t len; size_t len;
char thishost[NI_MAXHOST], shorthost[NI_MAXHOST], portstr[NI_MAXSERV]; char thishost[NI_MAXHOST], shorthost[NI_MAXHOST], portstr[NI_MAXSERV];
@ -469,13 +469,18 @@ match_cfg_line(Options *options, char **condition, struct passwd *pw,
*/ */
port = options->port <= 0 ? default_ssh_port() : options->port; port = options->port <= 0 ? default_ssh_port() : options->port;
ruser = options->user == NULL ? pw->pw_name : options->user; ruser = options->user == NULL ? pw->pw_name : options->user;
host = options->hostname == NULL ? host_arg : options->hostname; if (options->hostname != NULL) {
host = percent_expand(options->hostname,
"h", host_arg, (char *)NULL);
} else
host = xstrdup(host_arg);
debug3("checking match for '%s' host %s", cp, host); debug3("checking match for '%s' host %s", cp, host);
while ((attrib = strdelim(&cp)) && *attrib != '\0') { while ((attrib = strdelim(&cp)) && *attrib != '\0') {
if ((arg = strdelim(&cp)) == NULL || *arg == '\0') { if ((arg = strdelim(&cp)) == NULL || *arg == '\0') {
error("Missing Match criteria for %s", attrib); error("Missing Match criteria for %s", attrib);
return -1; result = -1;
goto out;
} }
len = strlen(arg); len = strlen(arg);
if (strcasecmp(attrib, "host") == 0) { if (strcasecmp(attrib, "host") == 0) {
@ -534,11 +539,14 @@ match_cfg_line(Options *options, char **condition, struct passwd *pw,
free(cmd); free(cmd);
} else { } else {
error("Unsupported Match attribute %s", attrib); error("Unsupported Match attribute %s", attrib);
return -1; result = -1;
goto out;
} }
} }
debug3("match %sfound", result ? "" : "not "); debug3("match %sfound", result ? "" : "not ");
*condition = cp; *condition = cp;
out:
free(host);
return result; return result;
} }