Fix bug #139: Unable to use TLS - due to not handling quotes around configuration strings.
Conflicts: src/util/misc.c
This commit is contained in:
parent
1af7e26c52
commit
ff8b8f5175
|
@ -110,6 +110,7 @@ static int config_parse_line(char* line, int line_count, void* ptr_data)
|
||||||
|
|
||||||
key = strip_white_space(key);
|
key = strip_white_space(key);
|
||||||
data = strip_white_space(data);
|
data = strip_white_space(data);
|
||||||
|
data = strip_off_quotes(data);
|
||||||
|
|
||||||
if (!*key || !*data)
|
if (!*key || !*data)
|
||||||
{
|
{
|
||||||
|
|
|
@ -483,3 +483,24 @@ int string_to_boolean(const char* str, int* boolean)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
char* strip_off_quotes(char* line)
|
||||||
|
{
|
||||||
|
size_t len;
|
||||||
|
|
||||||
|
if (!*line)
|
||||||
|
return line;
|
||||||
|
|
||||||
|
len = strlen(line);
|
||||||
|
if (len < 2)
|
||||||
|
return line;
|
||||||
|
|
||||||
|
if ((line[0] == '"' && line[len - 1] == '"') ||
|
||||||
|
(line[0] == '\'' && line[len - 1] == '\''))
|
||||||
|
{
|
||||||
|
line[len-1] = '\0';
|
||||||
|
return line + 1;
|
||||||
|
}
|
||||||
|
return line;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -34,6 +34,7 @@ extern void base32_encode(const unsigned char* buffer, size_t len, char* result)
|
||||||
extern void base32_decode(const char* src, unsigned char* dst, size_t len);
|
extern void base32_decode(const char* src, unsigned char* dst, size_t len);
|
||||||
extern char* strip_white_space(char* string);
|
extern char* strip_white_space(char* string);
|
||||||
extern void strip_off_ini_line_comments(char* line, int line_count);
|
extern void strip_off_ini_line_comments(char* line, int line_count);
|
||||||
|
extern char* strip_off_quotes(char* line);
|
||||||
|
|
||||||
extern int file_read_lines(const char* file, void* data, file_line_handler_t handler);
|
extern int file_read_lines(const char* file, void* data, file_line_handler_t handler);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue