fix compile complaints (and a bug)

svn:r4862

src/or/dirserv.c

@@ -337,7 +337,6 @@ int
 dirserv_add_descriptor(const char *desc, const char **msg)
 {
   routerinfo_t *ri = NULL;
-  size_t desc_len;
   tor_assert(msg);
   *msg = NULL;
 

src/or/router.c

@@ -329,7 +329,7 @@ init_keys(void)
       log_fn(LOG_ERR, "Error adding own fingerprint to approved set");
       return -1;
     }
-    if (dirserv_add_descriptor(&tmp, &m) != 1) {
+    if (dirserv_add_descriptor(tmp, &m) != 1) {
       log(LOG_ERR, "Unable to add own descriptor to directory: %s",
           m?m:"<unknown error>");
       return -1;