let an authdir that's not a naming authdir start even

if it doesn't have an approved-routers file. if it does,
read it and parse it as usual.


svn:r6182

3 files changed, 10 insertions, 5 deletions

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 45905e8e3b..0ed3e84a13 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -996,8 +996,8 @@ new_route_len(double cw, uint8_t purpose, extend_info_t *exit,
       purpose != CIRCUIT_PURPOSE_S_ESTABLISH_INTRO)
     routelen++;
 #endif
-  log_debug(LD_CIRC,"Chosen route length %d (%d routers available).",routelen,
-            smartlist_len(routers));
+  log_debug(LD_CIRC,"Chosen route length %d (%d routers available).",
+            routelen, smartlist_len(routers));
 
   num_acceptable_routers = count_acceptable_routers(routers);
 
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index a78bfca7d7..7b8792f4b1 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -173,8 +173,13 @@ dirserv_parse_fingerprint_file(const char *fname)
 
   cf = read_file_to_str(fname, 0);
   if (!cf) {
-    log_warn(LD_FS, "Cannot open fingerprint file %s", fname);
-    return -1;
+    if (get_options()->NamingAuthoritativeDir) {
+      log_warn(LD_FS, "Cannot open fingerprint file '%s'. Failing.", fname);
+      return -1;
+    } else {
+      log_info(LD_FS, "Cannot open fingerprint file '%s'. Returning.", fname);
+      return 0;
+    }
   }
   result = config_get_lines(cf, &front);
   tor_free(cf);
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 004b97b3ef..739f0b5623 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -3245,7 +3245,7 @@ routers_update_status_from_networkstatus(smartlist_t *routers,
       router->is_named = rs->status.is_named;
 
     if (!authdir) {
-      /* If we're an authdir, don't believe others. */
+      /* If we're not an authdir, believe others. */
       router->is_verified = rs->status.is_valid;
       router->is_running = rs->status.is_running;
       router->is_fast = rs->status.is_fast;