summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-05-20 14:58:28 -0400
committerNick Mathewson <nickm@torproject.org>2014-05-20 14:58:28 -0400
commit268a117cdf5e58da81fd9ece925c1b963f4c1ecb (patch)
treef5b020404bb4bc2c59c0968965c05d89337564a3 /src/or/config.c
parent465982012c69e78986d421604d27afd6ecbe70f6 (diff)
downloadtor-268a117cdf5e58da81fd9ece925c1b963f4c1ecb.tar.gz
tor-268a117cdf5e58da81fd9ece925c1b963f4c1ecb.zip
sandbox: tolerate reloading with DirPortFrontPage set
Also, don't tolerate changing DirPortFrontPage. Fixes bug 12028; bugfix on 0.2.5.1-alpha.
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index aa4c0079bf..b346f6648e 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3747,6 +3747,11 @@ options_transition_allowed(const or_options_t *old,
"Sandbox is active");
return -1;
}
+ if (! opt_streq(old->DirPortFrontPage, new_val->DirPortFrontPage)) {
+ *msg = tor_strdup("Can't change DirPortFrontPage"
+ " while Sandbox is active");
+ return -1;
+ }
}
return 0;