Having a ControlPort open doesn't mean we are a client

The options_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>

diff --git a/changes/ticket26062 b/changes/ticket26062
new file mode 100644 (file)
index 0000000..cd1fe3d
--- /dev/null
+++ b/changes/ticket26062
@@ -0,0 +1,4 @@
+  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/config.c b/src/or/config.c
index 20db37ae30e54ff42053c45abf3fe74b19fbe104..5e84ec1d61ee7298c14391c144b2a00329a86c35 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -8443,7 +8443,6 @@ options_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 ||
           options->HTTPTunnelPort_set);
 }