summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--src/or/dirserv.c7
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b548562b3..c0d141bdce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,14 @@
Changes in version 0.1.2.5-xxxx - 200?-??-??
o Minor bugfixes;
- Fix a bug when a PF socket is first used. (Patch from Fabian
- Keil)
+ Keil.)
+ - Fix an assert failure when the directory authority sets
+ AuthDirRejectUnlisted and then receives a descriptor from an
+ unlisted router (reported by seeess).
o Controller bugfixes:
- Report the circuit number correctly in STREAM CLOSED events. (Bug
- reported by Mike Perry)
+ reported by Mike Perry.)
Changes in version 0.1.2.4-alpha - 2006-12-03
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"))