aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2018-05-09 12:40:06 -0400
committerDavid Goulet <dgoulet@torproject.org>2018-05-09 12:50:53 -0400
commitbca8a104b291c0f475c87905e0dc958978776ecb (patch)
treec63ecbcad977886535dd0eacdfde3c85a92d73b3
parent5227754b2f441c93da6436697a19841e9e71246f (diff)
downloadtor-bca8a104b291c0f475c87905e0dc958978776ecb.tar.gz
tor-bca8a104b291c0f475c87905e0dc958978776ecb.zip
Having a ControlPort open doesn't mean we are a client
The any_client_port_set() returns true if the ControlPort is set which is wrong because we can have that port open but still not behave as a tor client (like many relays for instance). Fixes #26062 Signed-off-by: David Goulet <dgoulet@torproject.org>
-rw-r--r--changes/ticket260623
-rw-r--r--src/or/networkstatus.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/changes/ticket26062 b/changes/ticket26062
new file mode 100644
index 0000000000..1ee49d8608
--- /dev/null
+++ b/changes/ticket26062
@@ -0,0 +1,3 @@
+ o Minor bugfixes (client):
+ - Don't consider Tor running as a client if the ControlPort is open. Fixes
+ bug 26062; bugfix on 0.2.9.4-alpha.
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index d9ae32560e..d8e2c00273 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1584,7 +1584,6 @@ any_client_port_set(const or_options_t *options)
return (options->SocksPort_set ||
options->TransPort_set ||
options->NATDPort_set ||
- options->ControlPort_set ||
options->DNSPort_set);
}