diff options
| author | Yawning Angel <yawning@schwanenlied.me> | 2015-09-09 13:52:30 +0000 |
|---|---|---|
| committer | Yawning Angel <yawning@schwanenlied.me> | 2015-09-09 13:52:30 +0000 |
| commit | f6c446db47cb7dd08b1098312bf05f1442b8bb19 (patch) | |
| tree | 6d07c44e39739689442d069f27216c26dc6d68b2 /src | |
| parent | 98be93d6d7f8a72861de7444a8356e8d1abf6bb0 (diff) | |
| download | tor-f6c446db47cb7dd08b1098312bf05f1442b8bb19.tar.gz tor-f6c446db47cb7dd08b1098312bf05f1442b8bb19.zip | |
Check NoKeepAliveIsolateSOCKSAuth in a better place.
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/config.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index 190e4d4daa..98d9d83846 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6247,6 +6247,9 @@ parse_port_config(smartlist_t *out, } else if (!strcasecmp(elt, "PreferSOCKSNoAuth")) { prefer_no_auth = ! no; continue; + } else if (!strcasecmp(elt, "KeepAliveIsolateSOCKSAuth")) { + socks_iso_keep_alive = ! no; + continue; } if (!strcasecmpend(elt, "s")) @@ -6262,8 +6265,6 @@ parse_port_config(smartlist_t *out, isoflag = ISO_CLIENTPROTO; } else if (!strcasecmp(elt, "IsolateClientAddr")) { isoflag = ISO_CLIENTADDR; - } else if (!strcasecmp(elt, "KeepAliveIsolateSOCKSAuth")) { - socks_iso_keep_alive = ! no; } else { log_warn(LD_CONFIG, "Unrecognized %sPort option '%s'", portname, escaped(elt_orig)); |