diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-12-04 18:54:01 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-12-04 18:54:01 +0000 |
| commit | 44c55dad232cbb64a9269fa1f9808daa7c4cc101 (patch) | |
| tree | 58e8b8b71101a0330d438119aaa545f0719c99ed /src/or | |
| parent | c9eb1c6d5c16ddee1bc96fb5cb5af206dbfe423c (diff) | |
| download | tor-44c55dad232cbb64a9269fa1f9808daa7c4cc101.tar.gz tor-44c55dad232cbb64a9269fa1f9808daa7c4cc101.zip | |
Fix an assert failure when the directory authority sets
AuthDirRejectUnlisted and then receives a descriptor from an
unlisted router (reported by seeess).
svn:r9023
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/dirserv.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index a99420443e..473b7f6ad7 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -270,6 +270,8 @@ dirserv_router_get_status(const routerinfo_t *router, const char **msg) if (crypto_pk_get_digest(router->identity_pkey, d)) { log_warn(LD_BUG,"Error computing fingerprint"); + if (msg) + *msg = "Bug: Error computing fingerprint"; return FP_REJECT; } @@ -384,8 +386,11 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname, nickname, address); result |= FP_INVALID; } - if (reject_unlisted) + if (reject_unlisted) { + if (msg) + *msg = "Authdir rejects unknown routers."; return FP_REJECT; + } /* 0.1.0.2-rc was the first version that did enough self-testing that * we're willing to take its word about whether it's running. */ if (platform && !tor_version_as_new_as(platform,"0.1.0.2-rc")) |