diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2014-09-04 23:16:51 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-09-09 11:50:21 -0400 |
| commit | 607724c696a6e1bb10c8a955dac38f0ea947ce34 (patch) | |
| tree | 126d7b64ea14a844b110c5e4b0ee9a0c848aaaa4 /src/or/router.c | |
| parent | 835672166255fd090a2fb92ccf48ec0cfd8779b7 (diff) | |
| download | tor-607724c696a6e1bb10c8a955dac38f0ea947ce34.tar.gz tor-607724c696a6e1bb10c8a955dac38f0ea947ce34.zip | |
Remove support for naming directory authorities
This implements the meat of #12899. This commit should simply remove the
parts of Tor dirauths used to check whether a relay was supposed to be
named or not, it doesn't yet convert to a new mechanism for
reject/invalid/baddir/badexiting relays.
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/or/router.c b/src/or/router.c index 4d1e74e731..7bcc02ef39 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -911,9 +911,8 @@ init_keys(void) const char *m = NULL; routerinfo_t *ri; /* We need to add our own fingerprint so it gets recognized. */ - if (dirserv_add_own_fingerprint(options->Nickname, - get_server_identity_key())) { - log_err(LD_GENERAL,"Error adding own fingerprint to approved set"); + if (dirserv_add_own_fingerprint(get_server_identity_key())) { + log_err(LD_GENERAL,"Error adding own fingerprint to set of relays"); return -1; } if (mydesc) { |