aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-01-18 10:24:37 -0500
committerNick Mathewson <nickm@torproject.org>2017-01-18 10:25:10 -0500
commit9469aaaa82b353655c8e17f654954231ba3b09c8 (patch)
tree0603a1ca5ac990031278c886ae8af392dbbcc359
parent3dd738d5f943a188eb91d6753e055cb44c9c3cdb (diff)
downloadtor-9469aaaa82b353655c8e17f654954231ba3b09c8.tar.gz
tor-9469aaaa82b353655c8e17f654954231ba3b09c8.zip
Handle __NonSavedOptions correctly inside LINELIST_V blocks.
-rw-r--r--src/or/confparse.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/confparse.c b/src/or/confparse.c
index efcf4f981e..2d6cc7ac62 100644
--- a/src/or/confparse.c
+++ b/src/or/confparse.c
@@ -1148,6 +1148,11 @@ config_dump(const config_format_t *fmt, const void *default_options,
config_get_assigned_option(fmt, options, fmt->vars[i].name, 1);
for (; line; line = line->next) {
+ if (!strcmpstart(line->key, "__")) {
+ /* This check detects "hidden" variables inside LINELIST_V structures.
+ */
+ continue;
+ }
smartlist_add_asprintf(elements, "%s%s %s\n",
comment_option ? "# " : "",
line->key, line->value);