aboutsummaryrefslogtreecommitdiff
path: root/src/or/router.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-08-05 11:09:08 -0400
committerNick Mathewson <nickm@torproject.org>2014-08-05 11:09:08 -0400
commit04007448b9f318f4c3517ce173272f756a02f28c (patch)
tree086c9566e9e0c2004e427a89ae6ad1a1b784fff9 /src/or/router.c
parentfcbb21b414947d8ad7e4298d3952b84d8005dabc (diff)
downloadtor-04007448b9f318f4c3517ce173272f756a02f28c.tar.gz
tor-04007448b9f318f4c3517ce173272f756a02f28c.zip
Correctly remove extraneous space in router family lines
Fixes bug 12728; bugfix on 0.2.1.7-alpha when the SPLIT_IGNORE_SPACE option was added.
Diffstat (limited to 'src/or/router.c')
-rw-r--r--src/or/router.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/router.c b/src/or/router.c
index eabd9c3f59..1b65f266f2 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1884,7 +1884,7 @@ router_rebuild_descriptor(int force)
family = smartlist_new();
ri->declared_family = smartlist_new();
smartlist_split_string(family, options->MyFamily, ",",
- SPLIT_SKIP_SPACE|SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
+ SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK|SPLIT_STRIP_SPACE, 0);
SMARTLIST_FOREACH_BEGIN(family, char *, name) {
const node_t *member;
if (!strcasecmp(name, options->Nickname))