[or-cvs] r11218: Make v3-only authorities check reachability (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-08-20 11:43:17 -0400 (Mon, 20 Aug 2007)
New Revision: 11218

Modified:
   tor/trunk/
   tor/trunk/src/or/router.c
Log:
 r14726 at catbus:  nickm | 2007-08-20 11:42:07 -0400
 Make v3-only authorities check reachability



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r14726] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c	2007-08-20 15:42:27 UTC (rev 11217)
+++ tor/trunk/src/or/router.c	2007-08-20 15:43:17 UTC (rev 11218)
@@ -760,7 +760,10 @@
 int
 authdir_mode_tests_reachability(or_options_t *options)
 {
-  return authdir_mode_v1(options) || authdir_mode_v2(options);
+  return authdir_mode(options) &&
+    (options->V1AuthoritativeDir ||
+     options->V2AuthoritativeDir ||
+     options->V3AuthoritativeDir);
 }
 /** Return true iff we believe ourselves to be a bridge authoritative
  * directory server.