diff options
author | Nick Mathewson <nickm@torproject.org> | 2005-10-04 21:21:09 +0000 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2005-10-04 21:21:09 +0000 |
commit | 2d203fdcf319b45477bdcad7e3476ac3c45ee7e0 (patch) | |
tree | 77e9ae8a63c4ad69a1782a8d4c6798b125817743 /src/or/router.c | |
parent | b10df0d5950c28f8e4684014a4f6d02d51b61f74 (diff) | |
download | tor-2d203fdcf319b45477bdcad7e3476ac3c45ee7e0.tar tor-2d203fdcf319b45477bdcad7e3476ac3c45ee7e0.tar.gz |
link nicknames to trusted directory servers; log these nicknames when mentioning servers; also, when we get a naming conflict; log which nicknames or keys are supposed to bind.
svn:r5184
Diffstat (limited to 'src/or/router.c')
-rw-r--r-- | src/or/router.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/router.c b/src/or/router.c index 287c841e5..3db797ffd 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -370,7 +370,8 @@ init_keys(void) /* 6b. [authdirserver only] add own key to approved directories. */ crypto_pk_get_digest(get_identity_key(), digest); if (!router_digest_is_trusted_dir(digest)) { - add_trusted_dir_server(NULL, (uint16_t)options->DirPort, digest, + add_trusted_dir_server(options->Nickname, NULL, + (uint16_t)options->DirPort, digest, options->V1AuthoritativeDir); } /* success */ |