From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 5 May 2014 14:29:35 +0000 (-0400)
Subject: Don't start sandbox except for CMD_RUN_TOR
X-Git-Tag: tor-0.2.5.5-alpha~101
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d496963b4a98512711bd4cbc5565535d89e7845;p=thirdparty%2Ftor.git

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.
---

diff --git a/changes/bug11609 b/changes/bug11609
new file mode 100644
index 0000000000..2a116137cd
--- /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 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)) {