shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-09 18:04:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

config: Only use first occurence of each parameter

Browse Source 
ssh_config's manpage says:
"For each parameter, the first obtained value will be used."

Make libssh adhere to this rule.

BUG: https://red.libssh.org/issues/256

Signed-off-by: Alex Hermann <alex@hexla.nl>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 5f202d7ffa)
This commit is contained in:
Alex Hermann
2017-04-13 16:05:41 +02:00
committed by Andreas Schneider
parent 8dc3d883b8
commit 7b8b5eb4ea
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/config.c
View File

@@ -50,6 +50,8 @@ enum ssh_config_opcode_e {
SOC_GSSAPISERVERIDENTITY, SOC_GSSAPISERVERIDENTITY,
SOC_GSSAPICLIENTIDENTITY, SOC_GSSAPICLIENTIDENTITY,
SOC_GSSAPIDELEGATECREDENTIALS, SOC_GSSAPIDELEGATECREDENTIALS,
SOC_END /* Keep this one last in the list */
}; };
struct ssh_config_keyword_table_s { struct ssh_config_keyword_table_s {
@@ -185,7 +187,7 @@ static int ssh_config_get_yesno(char **str, int notfound) {
} }
static int ssh_config_parse_line(ssh_session session, const char *line, static int ssh_config_parse_line(ssh_session session, const char *line,
unsigned int count, int *parsing) { unsigned int count, int *parsing, int seen[]) {
enum ssh_config_opcode_e opcode; enum ssh_config_opcode_e opcode;
const char *p; const char *p;
char *s, *x; char *s, *x;
@@ -216,6 +218,12 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
} }
opcode = ssh_config_get_opcode(keyword); opcode = ssh_config_get_opcode(keyword);
if (*parsing == 1 && opcode != SOC_HOST) {
if (seen[opcode] == 0) {
return 0;
}
seen[opcode] = 1;
}
switch (opcode) { switch (opcode) {
case SOC_HOST: { case SOC_HOST: {
@@ -383,6 +391,7 @@ int ssh_config_parse_file(ssh_session session, const char *filename) {
unsigned int count = 0; unsigned int count = 0;
FILE *f; FILE *f;
int parsing; int parsing;
int seen[SOC_END - SOC_UNSUPPORTED] = {0};
if ((f = fopen(filename, "r")) == NULL) { if ((f = fopen(filename, "r")) == NULL) {
return 0; return 0;
@@ -393,7 +402,7 @@ int ssh_config_parse_file(ssh_session session, const char *filename) {
parsing = 1; parsing = 1;
while (fgets(line, sizeof(line), f)) { while (fgets(line, sizeof(line), f)) {
count++; count++;
if (ssh_config_parse_line(session, line, count, &parsing) < 0) { if (ssh_config_parse_line(session, line, count, &parsing, seen) < 0) {
fclose(f); fclose(f);
return -1; return -1;
} }