]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Check NoKeepAliveIsolateSOCKSAuth in a better place.
authorYawning Angel <yawning@schwanenlied.me>
Wed, 9 Sep 2015 13:52:30 +0000 (13:52 +0000)
committerYawning Angel <yawning@schwanenlied.me>
Wed, 9 Sep 2015 13:52:30 +0000 (13:52 +0000)
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

index 190e4d4daad31f708d54688f09d7482a9ff8981f..98d9d83846602e92f0d1d2ac58b9e7ee546d68d8 100644 (file)
@@ -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));