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

[nickm@xxxxxxxxxxxxxx]

commit bca8a104b291c0f475c87905e0dc958978776ecb
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
Date:   Wed May 9 12:40:06 2018 -0400

    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@xxxxxxxxxxxxxx>
---
 changes/ticket26062    | 3 +++
 src/or/networkstatus.c | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/changes/ticket26062 b/changes/ticket26062
new file mode 100644
index 000000000..1ee49d860
--- /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 d9ae32560..d8e2c0027 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);
 }
 

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits