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

Check NoKeepAliveIsolateSOCKSAuth in a better place.

Browse Source 
No functional changes, but since NoKeepAliveIsolateSOCKSAuth isn't
part of isoflag, it should be checked where all other similar options
are, and bypass the (no-op) masking at the end.
This commit is contained in:
Yawning Angel 2015-09-09 13:52:30 +00:00
parent 98be93d6d7
commit f6c446db47
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/or/config.c
View File

@ -6247,6 +6247,9 @@ parse_port_config(smartlist_t *out,
} else if (!strcasecmp(elt, "PreferSOCKSNoAuth")) { } else if (!strcasecmp(elt, "PreferSOCKSNoAuth")) {
prefer_no_auth = ! no; prefer_no_auth = ! no;
continue; continue;
} else if (!strcasecmp(elt, "KeepAliveIsolateSOCKSAuth")) {
socks_iso_keep_alive = ! no;
continue;
} }
if (!strcasecmpend(elt, "s")) if (!strcasecmpend(elt, "s"))
@ -6262,8 +6265,6 @@ parse_port_config(smartlist_t *out,
isoflag = ISO_CLIENTPROTO; isoflag = ISO_CLIENTPROTO;
} else if (!strcasecmp(elt, "IsolateClientAddr")) { } else if (!strcasecmp(elt, "IsolateClientAddr")) {
isoflag = ISO_CLIENTADDR; isoflag = ISO_CLIENTADDR;
} else if (!strcasecmp(elt, "KeepAliveIsolateSOCKSAuth")) {
socks_iso_keep_alive = ! no;
} else { } else {
log_warn(LD_CONFIG, "Unrecognized %sPort option '%s'", log_warn(LD_CONFIG, "Unrecognized %sPort option '%s'",
portname, escaped(elt_orig)); portname, escaped(elt_orig));