summaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-08-09 10:48:43 -0400
committerNick Mathewson <nickm@torproject.org>2017-08-09 10:58:07 -0400
commit801aa5d03b3a62c7ed09e8c36629ced23e8c663a (patch)
treec013a442411e49d17f1d0481fd3a3ca51828207b /src/or/main.c
parenteb43401bfb6d69db66d256582a99e63de7d222d8 (diff)
downloadtor-801aa5d03b3a62c7ed09e8c36629ced23e8c663a.tar.gz
tor-801aa5d03b3a62c7ed09e8c36629ced23e8c663a.zip
Block the port-forwarding helper at a higher point
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 42d984acfb..45c37159d5 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2036,7 +2036,8 @@ check_fw_helper_app_callback(time_t now, const or_options_t *options)
{
if (net_is_disabled() ||
! server_mode(options) ||
- ! options->PortForwarding) {
+ ! options->PortForwarding ||
+ options->NoExec) {
return PERIODIC_EVENT_NO_UPDATE;
}
/* 11. check the port forwarding app */