From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 5 Aug 2014 15:09:08 +0000 (-0400)
Subject: Correctly remove extraneous space in router family lines
X-Git-Tag: tor-0.2.6.1-alpha~196^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04007448b9f318f4c3517ce173272f756a02f28c;p=thirdparty%2Ftor.git

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.
---

diff --git a/changes/bug12728 b/changes/bug12728
new file mode 100644
index 0000000000..ee392457b4
--- /dev/null
+++ b/changes/bug12728
@@ -0,0 +1,4 @@
+
+  o Minor bugfixes:
+    - When generating our family list, remove spaces from around the
+      entries there.  Fixes bug 12728; bugfix on 0.2.1.7-alpha.
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))