diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-08-09 10:48:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-08-09 10:58:07 -0400 |
| commit | 5fa8d05bfa17d61a2cf96c87f0ffd9a2b6e577d2 (patch) | |
| tree | bafebb5a76021369f9287797eeadf0ef19d074e2 /src/or/config.c | |
| parent | 801aa5d03b3a62c7ed09e8c36629ced23e8c663a (diff) | |
| download | tor-5fa8d05bfa17d61a2cf96c87f0ffd9a2b6e577d2.tar.gz tor-5fa8d05bfa17d61a2cf96c87f0ffd9a2b6e577d2.zip | |
Block managed proxies at a higher point
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 7499dab479..e282a6cc60 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 */ |