diff options
| author | Roger Dingledine <arma@torproject.org> | 2005-01-03 17:47:32 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2005-01-03 17:47:32 +0000 |
| commit | 59504f483157420dc2562e8a750070965a2cdc42 (patch) | |
| tree | f464514141ec2d69227f501bdd24e72ea02debcb | |
| parent | 70075933c65d606a1b4dd24bff88ae10becea87d (diff) | |
| download | tor-59504f483157420dc2562e8a750070965a2cdc42.tar.gz tor-59504f483157420dc2562e8a750070965a2cdc42.zip | |
bugfix: if a server uploads a descriptor that's unapproved, actually
tell him so.
svn:r3243
| -rw-r--r-- | src/or/directory.c | 2 | ||||
| -rw-r--r-- | src/or/dirserv.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index b025404fbd..c6459cb0ca 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -635,7 +635,7 @@ connection_dir_client_reached_eof(connection_t *conn) log_fn(LOG_WARN,"http status 400 (bad request) response from dirserver '%s'. Malformed server descriptor?", conn->address); break; case 403: - log_fn(LOG_WARN,"http status 403 (unapproved server) response from dirserver '%s'. Is your clock skewed? Have you mailed us your identity fingerprint? Are you using the right key? See README.", conn->address); + log_fn(LOG_WARN,"http status 403 (unapproved server) response from dirserver '%s'. Is your clock skewed? Have you mailed us your key fingerprint? Are you using the right key? See http://tor.eff.org/doc/tor-doc.html#server.", conn->address); break; default: log_fn(LOG_WARN,"http status %d response unrecognized (server '%s').", status_code, conn->address); diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 1a2ee6b3ce..7462e1ee7c 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -380,7 +380,7 @@ dirserv_add_descriptor(const char **desc) /* This isn't really an error; return success. */ routerinfo_free(ri); *desc = end; - return 1; + return verified; } /* We don't have a newer one; we'll update this one. */ log_fn(LOG_INFO,"Dirserv updating desc for nickname '%s'",ri->nickname); @@ -403,7 +403,7 @@ dirserv_add_descriptor(const char **desc) *desc = end; directory_set_dirty(); - return 1; + return verified; } /** Remove all descriptors whose nicknames or fingerprints we don't |