summaryrefslogtreecommitdiff
path: root/src/or/control.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2004-11-09 17:15:17 +0000
committerNick Mathewson <nickm@torproject.org>2004-11-09 17:15:17 +0000
commitb9605745566610dddf51be3c1b4018961d0ab3ca (patch)
tree698172909816ae991f6d3bd7a3b4a43ee4d6d806 /src/or/control.c
parenta2079c074f9634a2eeed564d2514b547ab0a0b6b (diff)
downloadtor-b9605745566610dddf51be3c1b4018961d0ab3ca.tar.gz
tor-b9605745566610dddf51be3c1b4018961d0ab3ca.zip
Change interface to config_trial_assign even more; have it use get_options() instead
svn:r2754
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 07795044fc..5122a207b1 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -209,7 +209,7 @@ handle_control_setconf(connection_t *conn, uint16_t len, char *body)
return 0;
}
- if ((r=config_trial_assign(get_options(), lines, 1)) < 0) {
+ if ((r=config_trial_assign(lines, 1)) < 0) {
log_fn(LOG_WARN,"Controller gave us config lines that didn't validate.");
if (r==-1) {
send_control_error(conn, ERR_UNRECOGNIZED_CONFIG_KEY,