diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-19 15:32:44 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-19 15:32:44 -0400 |
| commit | acbfc9c8cc2c24adb610d391cb2b83d7cbc11719 (patch) | |
| tree | 831e14a7b6c842b50b0ec928f8f84ff9e7fddb5c /src/or | |
| parent | 60fd08f40be9bfe3e53de4e22b66f25451206f96 (diff) | |
| parent | a7b46336eb5f1f7f734ac2d978c7ab17d1c870c0 (diff) | |
| download | tor-acbfc9c8cc2c24adb610d391cb2b83d7cbc11719.tar.gz tor-acbfc9c8cc2c24adb610d391cb2b83d7cbc11719.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/confparse.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/confparse.c b/src/or/confparse.c index 717d4ac2aa..98fde98e7d 100644 --- a/src/or/confparse.c +++ b/src/or/confparse.c @@ -91,12 +91,15 @@ config_get_lines(const char *string, config_line_t **result, int extended) { config_line_t *list = NULL, **next; char *k, *v; + const char *parse_err; next = &list; do { k = v = NULL; - string = parse_config_line_from_str(string, &k, &v); + string = parse_config_line_from_str_verbose(string, &k, &v, &parse_err); if (!string) { + log_warn(LD_CONFIG, "Error while parsing configuration: %s", + parse_err?parse_err:"<unknown>"); config_free_lines(list); tor_free(k); tor_free(v); |