diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-06-11 10:16:36 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-06-11 10:16:36 -0400 |
| commit | 2728a12232cf3e93986493488a4042e02f704f30 (patch) | |
| tree | bd3dfc3074755fc0129e4fd3499cbef0d194555b | |
| parent | 399eebea5480f9515e8a9cd204cd8c5b0dc544db (diff) | |
| parent | ada5668c5e2c32e7419091221627bff8b4d254fe (diff) | |
| download | tor-2728a12232cf3e93986493488a4042e02f704f30.tar.gz tor-2728a12232cf3e93986493488a4042e02f704f30.zip | |
Merge branch 'maint-0.2.8' into release-0.2.8
| -rw-r--r-- | changes/bug19203 | 4 | ||||
| -rw-r--r-- | src/or/nodelist.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/changes/bug19203 b/changes/bug19203 new file mode 100644 index 0000000000..96bc1e855a --- /dev/null +++ b/changes/bug19203 @@ -0,0 +1,4 @@ + o Major bugfixes (user interface): + - Correctly give a warning in the cases where a relay is specified by + nickname, and one such relay is found, but it is not officially Named. + Fixes bug 19203; bugfix on 0.2.3.1-alpha. diff --git a/src/or/nodelist.c b/src/or/nodelist.c index abbb82dfdd..89b5355c8d 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -594,10 +594,10 @@ node_get_by_nickname,(const char *nickname, int warn_if_unnamed)) "but none is listed as Named in the directory consensus. " "Choosing one arbitrarily.", nickname); } - } else if (smartlist_len(matches)>1 && warn_if_unnamed) { + } else if (smartlist_len(matches)==1 && warn_if_unnamed) { char fp[HEX_DIGEST_LEN+1]; node_t *node = smartlist_get(matches, 0); - if (node->name_lookup_warned) { + if (! node->name_lookup_warned) { base16_encode(fp, sizeof(fp), node->identity, DIGEST_LEN); log_warn(LD_CONFIG, "You specified a server \"%s\" by name, but the directory " |