aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-05-08 10:33:46 +0000
committerRoger Dingledine <arma@torproject.org>2007-05-08 10:33:46 +0000
commitd136f2a7b2754d4c7e5dd3395c9f4bcd2acaca94 (patch)
treea3d9378cf68ada052518d2f95aeea96cbaef647e
parent54f5ab39b331a39081d568d4d4fc5d5e56ce4565 (diff)
downloadtor-d136f2a7b2754d4c7e5dd3395c9f4bcd2acaca94.tar.gz
tor-d136f2a7b2754d4c7e5dd3395c9f4bcd2acaca94.zip
When we are reporting the DirServer line we just parsed, we were
logging the second stanza of the key fingerprint, not the first. svn:r10140
-rw-r--r--ChangeLog2
-rw-r--r--src/or/config.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4c35c93350..2fb97a35e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -111,6 +111,8 @@ Changes in version 0.2.0.1-alpha - 2007-??-??
- Fix a bug in dirserv_remove_invalid() that would cause authorities to
corrupt memory under some really unlikely scenarios.
- Add even more asserts to hunt down bug 417.
+ - When we are reporting the DirServer line we just parsed, we were
+ logging the second stanza of the key fingerprint, not the first.
o Minor bugfixes (controller), reported by daejees:
- Make 'getinfo fingerprint' return a 551 error if we're not a
diff --git a/src/or/config.c b/src/or/config.c
index f1b5637383..c00399b93e 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3554,7 +3554,7 @@ parse_dir_server_line(const char *line, int validate_only)
if (!validate_only) {
log_debug(LD_DIR, "Trusted dirserver at %s:%d (%s)", address,
(int)dir_port,
- (char*)smartlist_get(items,1));
+ (char*)smartlist_get(items,0));
add_trusted_dir_server(nickname, address, dir_port, or_port, digest,
is_v1_authority, is_v2_authority,
is_bridge_authority, is_hidserv_authority);