aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Hermann <alex@hexla.nl>2017-04-04 11:23:06 +0200
committerAndreas Schneider <asn@cryptomilk.org>2017-04-13 16:10:09 +0200
commit8dc3d883b8353846487d263ba076b95d74ea40da (patch)
tree589f17e42120b9c78a312df8dda97609166238a6
parent24a3f7020c48382b8318a93fc2b7c5033efc3c4d (diff)
downloadlibssh-8dc3d883b8353846487d263ba076b95d74ea40da.tar.gz
libssh-8dc3d883b8353846487d263ba076b95d74ea40da.tar.xz
libssh-8dc3d883b8353846487d263ba076b95d74ea40da.zip
config: Don't expand Host variable
Tokens are not allowed (according to the manpage). Expansion was introduced by a wrong fix for #127. This commit reverts part of 6eea08a9ef Signed-off-by: Alex Hermann <alex@hexla.nl> Reviewed-by: Andreas Schneider <asn@cryptomilk.org> (cherry picked from commit c3a8b5009ffacd7bda838ca48c79697847e83c19)
-rw-r--r--src/config.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/config.c b/src/config.c
index 3b9e3a9b..8577673b 100644
--- a/src/config.c
+++ b/src/config.c
@@ -227,18 +227,12 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
p != NULL && p[0] != '\0';
p = ssh_config_get_str_tok(&s, NULL)) {
if (ok >= 0) {
- char *z = ssh_path_expand_escape(session, p);
-
- if (z == NULL) {
- z = strdup(p);
- }
- ok = match_hostname(lowerhost, z, strlen(z));
+ ok = match_hostname(lowerhost, p, strlen(p));
if (ok < 0) {
*parsing = 0;
} else if (ok > 0) {
*parsing = 1;
}
- free(z);
}
}
SAFE_FREE(lowerhost);