[tor-commits] [tor/master] Block managed proxies at a higher point

[nickm at torproject.org]

commit 5fa8d05bfa17d61a2cf96c87f0ffd9a2b6e577d2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 9 10:48:43 2017 -0400

    Block managed proxies at a higher point
---
 src/or/config.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/or/config.c b/src/or/config.c
index 7499dab47..e282a6cc6 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -5741,6 +5741,15 @@ parse_transport_line(const or_options_t *options,
     goto err;
   }
 
+  if (is_managed && options->NoExec) {
+    log_warn(LD_CONFIG,
+             "Managed proxies are not compatible with NoExec mode; ignoring."
+             "(%sTransportPlugin line was %s)",
+             server ? "Server" : "Client", escaped(line));
+    r = 0;
+    goto done;
+  }
+
   if (is_managed) {
     /* managed */