log a warning if you're running an unverified server, to let

you know you might want to get it verified

also, moved that whole block below the check-signature logic, so
we don't execute it if the directory is a fake.

(the recommended-versions logic is still executed before the signature
is checked; we should fix that.)

svn:r2131

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index b0bca530aff06108faf0766bdc5cc365080d04c9..60dc8683e92eed52113644ea11ef56e471c43b68 100644 (file)
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -390,14 +390,6 @@ router_parse_routerlist_from_directory(const char *str,
   }
   tok->n_args = 0; /* Don't free the strings in good_nickname_lst yet. */
 
-  /* Determine if my routerinfo is considered verified. */
-  {
-    routerinfo_t *me = router_get_my_routerinfo();
-    if(me)
-      router_update_status_from_smartlist(me, published_on,
-                                          good_nickname_list);
-  }
-
   /* Read the router list from s, advancing s up past the end of the last
    * router. */
   str = end;
@@ -427,6 +419,21 @@ router_parse_routerlist_from_directory(const char *str,
     goto err;
   }
 
+  /* Determine if my routerinfo is considered verified. */
+  {
+    static int have_warned_about_unverified_status = 0;
+    routerinfo_t *me = router_get_my_routerinfo();
+    if(me) {
+      router_update_status_from_smartlist(me, published_on,
+                                          good_nickname_list);
+      if(me->is_verified == 0 && !have_warned_about_unverified_status) {
+        log_fn(LOG_WARN,"Dirserver %s lists your server as unverified. Please consider sending your identity fingerprint to the tor-ops.", "");
+        /* XXX008 can we print the name of the dirserver above? how to get it */
+        have_warned_about_unverified_status = 1;
+      }
+    }
+  }
+
   if (*dest)
     routerlist_free(*dest);
   *dest = new_dir;