commit 5d496963b4a98512711bd4cbc5565535d89e7845 Author: Nick Mathewson nickm@torproject.org Date: Mon May 5 10:29:35 2014 -0400

Don't start sandbox except for CMD_RUN_TOR

This was crashing on --verify-config in the debian startup script, if you had sandboxing enabled. Fixes 11609; fix on 0.2.5.1-alpha. --- changes/bug11609 | 5 +++++ src/or/main.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug11609 b/changes/bug11609 new file mode 100644 index 0000000..2a11613 --- /dev/null +++ b/changes/bug11609 @@ -0,0 +1,5 @@ + o Minor bugfixes (sandbox): + - Don't try to enable the sandbox when using the Tor binary to + check its configuration, hash a passphrase, or so on. Doing + so was crashing on startup for some users. Fixes bug 11609; + bugfix on 0.2.5.1-alpha. diff --git a/src/or/main.c b/src/or/main.c index 6713d80..1e59157 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2938,7 +2938,7 @@ tor_main(int argc, char *argv[]) if (tor_init(argc, argv)<0) return -1;

- if (get_options()->Sandbox) { + if (get_options()->Sandbox && get_options()->command == CMD_RUN_TOR) { sandbox_cfg_t* cfg = sandbox_init_filter();

if (sandbox_init(cfg)) {