1
0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-08 19:02:06 +03:00

BUG 103: Fix ProxyCommand parsing.

This commit is contained in:
Andreas Schneider
2013-06-02 19:06:33 +02:00
parent 2d28ee7d22
commit fcf8af20f8

View File

@@ -82,7 +82,7 @@ static enum ssh_config_opcode_e ssh_config_get_opcode(char *keyword) {
return SOC_UNSUPPORTED; return SOC_UNSUPPORTED;
} }
static char *ssh_config_get_token(char **str) { static char *ssh_config_get_cmd(char **str) {
register char *c; register char *c;
char *r; char *r;
@@ -102,6 +102,25 @@ static char *ssh_config_get_token(char **str) {
} }
} }
for (r = c; *c; c++) {
if (*c == '\n') {
*c = '\0';
goto out;
}
}
out:
*str = c + 1;
return r;
}
static char *ssh_config_get_token(char **str) {
register char *c;
char *r;
c = ssh_config_get_cmd(str);
for (r = c; *c; c++) { for (r = c; *c; c++) {
if (isblank(*c)) { if (isblank(*c)) {
*c = '\0'; *c = '\0';
@@ -299,7 +318,7 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
} }
break; break;
case SOC_PROXYCOMMAND: case SOC_PROXYCOMMAND:
p = ssh_config_get_str(&s, NULL); p = ssh_config_get_cmd(&s);
if (p && *parsing) { if (p && *parsing) {
ssh_options_set(session, SSH_OPTIONS_PROXYCOMMAND, p); ssh_options_set(session, SSH_OPTIONS_PROXYCOMMAND, p);
} }