Commit cf6ba3e7 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

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
parent 4f14826c

src/or/circuitbuild.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

src/or/dirserv.c

+7 −2
Original line number Diff line number Diff line
@@ -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);

    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);

src/or/routerlist.c

+1 −1
Original line number Diff line number Diff line
@@ -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;