Also disable spawning on Sandbox.

This isn't a functional change, but it makes our logic more clear,
and catches bugs earlier.

diff --git a/changes/feature22976 b/changes/feature22976
index 334f47ad0a424606d93524260dd4967d509ae5f3..407fd15b0a2a0967c80358a17691f8d47a1d02e9 100644 (file)
--- 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 e282a6cc60a228636ddde3405c20ecc57a61f1ca..30853724e499b88cda4fcad22603b2814a9ec0bc 100644 (file)
--- 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();
   }