mainloop: Set client role if ControlPort is set

It turns out that if _only_ the ControlPort is set and nothing else, tor would
simply not bootstrap and thus not start properly. Commit 67a41b6306
removed that requirement for tor to be considered a "client".

Unfortunately, this made the mainloop enable basically nothing if only the
ControlPort is set in the torrc.

This commit now makes it that we also consider the ControlPort when deciding
if we are a Client or not. It does not revert 67a41b6306 meaning
options_any_client_port_set() stays the same, not looking at the control port.

Fixes #27849.

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet
2018-09-26 08:36:08 -04:00
committed by Nick Mathewson
parent 38599de2dd
commit b5731cdf2e
2 changed files with 11 additions and 1 deletions
+5
View File
@@ -0,0 +1,5 @@
o Major bugfixes (mainloop, bootstrap):
- Make sure Tor bootstraps and works properly if only the ControlPort is
set. Prior to this fix, Tor would only bootstrap with at least a client
port being set (Socks, Trans, NATD, DNS or HTTPTunnel port). Fixes bug
27849; bugfix on 0.3.4.1-alpha.