[tor-commits] [tor/master] Having a ControlPort open doesn't mean we are a client

[nickm at torproject.org]

commit 67a41b63063370c2c655a91a801f7be2dd4732a5
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Apr 25 13:43:37 2018 -0400

    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 at torproject.org>
---
 changes/ticket26062 | 4 ++++
 src/or/config.c     | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/ticket26062 b/changes/ticket26062
new file mode 100644
index 000000000..cd1fe3df4
--- /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 20db37ae3..5e84ec1d6 100644
--- 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);
 }