From 0b0654662010a14579ce9c8dac9a1719d8c47160 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 30 Jan 2008 18:32:30 +0000 Subject: r17844@catbus: nickm | 2008-01-30 13:31:37 -0500 Fix bug 597: stop telling people to email Tor-ops. Also give a better suggestion when some other identity has been assigned the nickname we are using. svn:r13337 --- ChangeLog | 2 ++ src/or/networkstatus.c | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index b4e27d223b..fd92d71fd1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ Changes in version 0.2.0.19-alpha - 2008-0?-?? - Directory caches now fetch certificates from all authorities listed in a networkstatus consensus, even when they do not recognize them. Fixes bug 571. Bugfix on 0.2.0.x. + - Stop recommending that every server operator send mail to tor-ops. + Resolves bug 597. Bugfix on 0.1.2.x. Changes in version 0.2.0.18-alpha - 2008-01-25 diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 961adab07e..b09dc556f5 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1527,6 +1527,7 @@ routers_update_all_from_networkstatus(time_t now, int dir_version) routerinfo_t *me; routerlist_t *rl = router_get_routerlist(); networkstatus_vote_t *consensus = networkstatus_get_live_consensus(now); + or_options_t *options = get_options(); if (networkstatus_v2_list_has_changed) download_status_map_update_from_v2_networkstatus(); @@ -1554,15 +1555,14 @@ routers_update_all_from_networkstatus(time_t now, int dir_version) "Are you misconfigured?"); have_warned_about_invalid_status = 1; } else if (rs->is_unnamed) { - /* XXXX020 this isn't a useful warning. */ + /* Maybe upgrade this to notice? XXXX020 */ log_info(LD_GENERAL, "The directory have assigned the nickname " - "you're using to a different identity."); + "you're using (%s) to a different identity; you may want to " + "choose a different nickname.", options->Nickname); have_warned_about_invalid_status = 1; } else if (!rs->is_named) { - /*XXXX020 this isn't a correct warning. */ - log_info(LD_GENERAL, "The directory authorities do not recognize " - "your nickname. Please consider sending your " - "nickname and identity fingerprint to the tor-ops."); + log_debug(LD_GENERAL, "The directory authorities do not currently " + "recognize your nickname."); have_warned_about_invalid_status = 1; } } -- cgit v1.2.3-54-g00ecf