[tor-commits] [tor/master] Check NoKeepAliveIsolateSOCKSAuth in a better place.

[nickm at torproject.org]

commit f6c446db47cb7dd08b1098312bf05f1442b8bb19
Author: Yawning Angel <yawning at schwanenlied.me>
Date:   Wed Sep 9 13:52:30 2015 +0000

    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.
---
 src/or/config.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 190e4d4..98d9d83 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));