diff options
author | Nick Mathewson <nickm@torproject.org> | 2014-05-05 10:29:35 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2014-05-05 10:29:35 -0400 |
commit | 5d496963b4a98512711bd4cbc5565535d89e7845 (patch) | |
tree | f44149eff710e6a195ae975863d2f7a9aba5a060 /src/or/main.c | |
parent | 8a173635bcd85ad7375d996fb39efeaddd8c611d (diff) | |
download | tor-5d496963b4a98512711bd4cbc5565535d89e7845.tar.gz tor-5d496963b4a98512711bd4cbc5565535d89e7845.zip |
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.
Diffstat (limited to 'src/or/main.c')
-rw-r--r-- | src/or/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c index 6713d80368..1e591577fe 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)) { |