summaryrefslogtreecommitdiff
path: root/src/or/control.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-11-27 21:32:51 -0500
committerNick Mathewson <nickm@torproject.org>2011-11-27 21:32:51 -0500
commit73436a1d6fdbe411a0ee869ee570f4a1239cfa81 (patch)
tree71992d0c37ac4ea6b11dabb695d01a3d61b9946e /src/or/control.c
parent9ce5801e22790e4df702b4a56555404c75ac8058 (diff)
downloadtor-73436a1d6fdbe411a0ee869ee570f4a1239cfa81.tar.gz
tor-73436a1d6fdbe411a0ee869ee570f4a1239cfa81.zip
Add the ability to append and clear linelist options from cmdline
This will be important for getting stuff to work right across zones.
Diffstat (limited to 'src/or/control.c')
-rw-r--r--src/or/control.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c
index 109eb8857b..19904ddeb9 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -737,7 +737,7 @@ control_setconf_helper(control_connection_t *conn, uint32_t len, char *body,
SMARTLIST_FOREACH(entries, char *, cp, tor_free(cp));
smartlist_free(entries);
- if (config_get_lines(config, &lines) < 0) {
+ if (config_get_lines(config, &lines, 0) < 0) {
log_warn(LD_CONTROL,"Controller gave us config lines we can't parse.");
connection_write_str_to_buf("551 Couldn't parse configuration\r\n",
conn);