[tor-commits] [tor/master] Also disable spawning on Sandbox.

[nickm at torproject.org]

commit a0bb1ff6ab0be8faa7284aec3f7f93e31e8578d9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 9 10:56:57 2017 -0400

    Also disable spawning on Sandbox.
    
    This isn't a functional change, but it makes our logic more clear,
    and catches bugs earlier.
---
 changes/feature22976 | 3 ++-
 src/or/config.c      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/changes/feature22976 b/changes/feature22976
index 334f47ad0..407fd15b0 100644
--- a/changes/feature22976
+++ b/changes/feature22976
@@ -1,5 +1,6 @@
   o Minor features (integration, hardening):
-    - Added a new NoExec option to . When this option is set to 1,
+    - Added a new NoExec option, to prevent Tor from running
+      other programs. When this option is set to 1,
       Tor will never try to run another program, regardless of
       the settings of PortForwardingHelper, ClientTransportPlugin,
       or ServerTransportPlugin. Once NoExec is set, it cannot be
diff --git a/src/or/config.c b/src/or/config.c
index e282a6cc6..30853724e 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1596,7 +1596,7 @@ options_act(const or_options_t *old_options)
   const int transition_affects_guards =
     old_options && options_transition_affects_guards(old_options, options);
 
-  if (options->NoExec) {
+  if (options->NoExec || options->Sandbox) {
     tor_disable_spawning_background_processes();
   }