[or-cvs] the other half of the bugfix: tolerate a trusted dirserver ...

[arma at seul.org]

Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	routerlist.c 
Log Message:
the other half of the bugfix: tolerate a trusted dirserver claiming
dirport 0 in its descriptor.


Index: routerlist.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/routerlist.c,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -d -r1.242 -r1.243
--- routerlist.c	1 Jul 2005 01:59:37 -0000	1.242
+++ routerlist.c	15 Jul 2005 18:56:59 -0000	1.243
@@ -247,8 +247,8 @@
 {
   if (routerlist) {
     SMARTLIST_FOREACH(routerlist->routers, routerinfo_t *, router,
-                 if (router_digest_is_trusted_dir(router->identity_digest)) {
-                   tor_assert(router->dir_port > 0);
+                 if (router_digest_is_trusted_dir(router->identity_digest) &&
+                     router->dir_port > 0) {
                    router->is_running = 1;
                    router->status_set_at = time(NULL);
                  });