[or-cvs] r11989: Reset the is_named flag only on non-naming directories. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-10-16 13:21:01 -0400 (Tue, 16 Oct 2007)
New Revision: 11989

Modified:
   tor/trunk/
   tor/trunk/src/or/networkstatus.c
Log:
 r15859 at catbus:  nickm | 2007-10-16 13:09:28 -0400
 Reset the is_named flag only on non-naming directories.



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

Modified: tor/trunk/src/or/networkstatus.c
===================================================================
--- tor/trunk/src/or/networkstatus.c	2007-10-16 16:59:42 UTC (rev 11988)
+++ tor/trunk/src/or/networkstatus.c	2007-10-16 17:21:01 UTC (rev 11989)
@@ -1173,8 +1173,9 @@
     }
     if (r>0) {
       /* We have no routerstatus for this router. Clear flags and skip it. */
+      if (!namingdir)
+        router->is_named = 0;
       if (!authdir) {
-        router->is_named = 0;
         if (router->purpose == ROUTER_PURPOSE_GENERAL) {
           router->is_valid = router->is_running =
             router->is_fast = router->is_stable =