bugfix: if a server uploads a descriptor that's unapproved, actually

tell him so.

svn:r3243

diff --git a/src/or/directory.c b/src/or/directory.c
index b025404fbd0723e50fa3b718d6235733ceb49a12..c6459cb0ca7ef7b81a7b53cb4f3b5a3a9d23bb62 100644 (file)
--- 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 1a2ee6b3ce48748d68549f87060e466f03a25559..7462e1ee7cab7523f84c97a5d3abe7914825b47c 100644 (file)
--- 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