nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix SocksSocket 0. That was easy!

Browse Source
This commit is contained in:
Nick Mathewson 2015-01-16 11:37:11 -05:00
parent 485fdcf826
commit 78c53eff85
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/or/config.c
View File

@ -5821,7 +5821,10 @@ parse_port_config(smartlist_t *out,
addrport = smartlist_get(elts, 0);
if (is_unix_socket) {
/* leave it as it is. */
port = 1;
if (!strcmp(addrport, "0"))
port = 0;
else
port = 1;
} else if (!strcmp(addrport, "auto")) {
port = CFG_AUTO_PORT;
tor_addr_parse(&addr, defaultaddr);
@ -6052,7 +6055,7 @@ parse_port_config(smartlist_t *out,
warn_nonlocal_client_ports(out, portname, listener_type);
}
if (!is_unix_socket && got_zero_port && got_nonzero_port) {
if (got_zero_port && got_nonzero_port) {
log_warn(LD_CONFIG, "You specified a nonzero %sPort along with '%sPort 0' "
"in the same configuration. Did you mean to disable %sPort or "
"not?", portname, portname, portname);