summaryrefslogtreecommitdiff
path: root/src/or/control.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-11-09 04:28:18 +0000
committerRoger Dingledine <arma@torproject.org>2004-11-09 04:28:18 +0000
commit90b47172bd3644704aa961862dc7a79e5f10a069 (patch)
tree0871be52adea1ca75439dc23d343ce50857872e3 /src/or/control.c
parent3805221262c92802dfe57eff4cc8652ee62b8537 (diff)
downloadtor-90b47172bd3644704aa961862dc7a79e5f10a069.tar.gz
tor-90b47172bd3644704aa961862dc7a79e5f10a069.zip
Make an options_act() where we do all the things a new options set
needs. Still needs more work. svn:r2716
Diffstat (limited to 'src/or/control.c')
-rw-r--r--src/or/control.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c
index e0d0360d05..bc5cfeea82 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -222,8 +222,12 @@ handle_control_setconf(connection_t *conn, uint16_t len, char *body)
return 0;
}
- set_options(options); /* put the new one into place */
config_free_lines(lines);
+ set_options(options); /* put the new one into place */
+ if (options_act() < 0) { /* acting on them failed. die. */
+ log_fn(LOG_ERR,"Acting on config options left us in a broken state. Dying.");
+ exit(1);
+ }
send_control_done(conn);
return 0;
}