diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-19 15:32:17 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-19 15:32:17 -0400 |
| commit | a7b46336eb5f1f7f734ac2d978c7ab17d1c870c0 (patch) | |
| tree | 66cc240da6fb2cedc8dfa21adf9dc2183fd293f2 /src/or/confparse.c | |
| parent | 60d14421363bdbeee337ba69b21640058a26a6bd (diff) | |
| parent | 1827be0bd6a400f4b5970f5b37b1d2c8e83b6a3f (diff) | |
| download | tor-a7b46336eb5f1f7f734ac2d978c7ab17d1c870c0.tar tor-a7b46336eb5f1f7f734ac2d978c7ab17d1c870c0.tar.gz | |
Merge remote-tracking branch 'public/bug7950' into maint-0.2.4
Diffstat (limited to 'src/or/confparse.c')
| -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 717d4ac2a..98fde98e7 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); |