aboutsummaryrefslogtreecommitdiff
path: root/src/or/routerlist.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-01-03 17:53:20 +0000
committerNick Mathewson <nickm@torproject.org>2005-01-03 17:53:20 +0000
commitfca7ba977765061731873ef36a32777f0df8ee89 (patch)
tree1daf736f4f1514112bb85c8aa5be6dfa7745d5a8 /src/or/routerlist.c
parent59504f483157420dc2562e8a750070965a2cdc42 (diff)
downloadtor-fca7ba977765061731873ef36a32777f0df8ee89.tar
tor-fca7ba977765061731873ef36a32777f0df8ee89.tar.gz
Resolve task 42: find where 19-char nicknames were getting truncated when read from certs, and fix it. Also audit use of MAX_NICKNAME_LEN; no other badness found, but some docs/code cleaned up a touch.
svn:r3244
Diffstat (limited to 'src/or/routerlist.c')
-rw-r--r--src/or/routerlist.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 293797f6c..6a68bb96e 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -311,8 +311,8 @@ add_nickname_list_to_smartlist(smartlist_t *sl, const char *list, int warn_if_do
SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
SMARTLIST_FOREACH(nickname_list, const char *, nick, {
- if (strlen(nick) > MAX_HEX_NICKNAME_LEN) {
- log_fn(LOG_WARN,"Nickname too long; skipping");
+ if (!is_legal_nickname_or_hexdigest(nick)) {
+ log_fn(LOG_WARN,"Nickname %s is misformed; skipping", nick);
continue;
}
router = router_get_by_nickname(nick);