aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2013-06-02 19:06:33 +0200
committerAndreas Schneider <asn@cryptomilk.org>2013-06-02 19:33:57 +0200
commit7ba381116d31a2293bf107d8c46cf0ec2fe444cc (patch)
treee021c52e6b168ea05ef6785a88f3bc5b4da9097c
parent6f59c0534dec269c078847d5a84defd84603ab30 (diff)
downloadlibssh-7ba381116d31a2293bf107d8c46cf0ec2fe444cc.tar.gz
libssh-7ba381116d31a2293bf107d8c46cf0ec2fe444cc.tar.xz
libssh-7ba381116d31a2293bf107d8c46cf0ec2fe444cc.zip
BUG 103: Fix ProxyCommand parsing.
-rw-r--r--src/config.c23
1 files changed, 21 insertions, 2 deletions
diff --git a/src/config.c b/src/config.c
index 29a1b543..48f042de 100644
--- a/src/config.c
+++ b/src/config.c
@@ -78,7 +78,7 @@ static enum ssh_config_opcode_e ssh_config_get_opcode(char *keyword) {
return SOC_UNSUPPORTED;
}
-static char *ssh_config_get_token(char **str) {
+static char *ssh_config_get_cmd(char **str) {
register char *c;
char *r;
@@ -99,6 +99,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++) {
if (isblank(*c)) {
*c = '\0';
goto out;
@@ -295,7 +314,7 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
}
break;
case SOC_PROXYCOMMAND:
- p = ssh_config_get_str(&s, NULL);
+ p = ssh_config_get_cmd(&s);
if (p && *parsing) {
ssh_options_set(session, SSH_OPTIONS_PROXYCOMMAND, p);
}