summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-05-31 08:26:10 -0400
committerNick Mathewson <nickm@torproject.org>2019-05-31 08:26:10 -0400
commit70b85358afd0a8d4291489f9e9f5654ab2d53371 (patch)
tree1a408320acead48e96de06a6f3355e1273d88906
parente5deb2bbc73d8830ae6c479a4532e72112f5484a (diff)
downloadtor-70b85358afd0a8d4291489f9e9f5654ab2d53371.tar.gz
tor-70b85358afd0a8d4291489f9e9f5654ab2d53371.zip
Fix a logic error in deciding whether to accept SessionGroup=
Fixes bug 22619; bugfix on 0.2.7.2-alpha
-rw-r--r--changes/bug226193
-rw-r--r--src/app/config/config.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug22619 b/changes/bug22619
new file mode 100644
index 0000000000..9c71996f5b
--- /dev/null
+++ b/changes/bug22619
@@ -0,0 +1,3 @@
+ o Minor bugfixes (circuit isolation):
+ - Fix a logic error that prevented the SessionGroup sub-option from
+ being accepted. Fixes bug 22619; bugfix on 0.2.7.2-alpha.
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 2a504d3065..3525597591 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -7080,7 +7080,7 @@ parse_port_config(smartlist_t *out,
if (!strcasecmpstart(elt, "SessionGroup=")) {
int group = (int)tor_parse_long(elt+strlen("SessionGroup="),
10, 0, INT_MAX, &ok, NULL);
- if (!ok || !allow_no_stream_options) {
+ if (!ok || allow_no_stream_options) {
log_warn(LD_CONFIG, "Invalid %sPort option '%s'",
portname, escaped(elt));
goto err;