[or-cvs] r11569: make directories_have_accepted_server_descriptor() able to h (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2007-09-21 18:14:39 -0400 (Fri, 21 Sep 2007)
New Revision: 11569

Modified:
   tor/trunk/src/or/directory.c
Log:
make directories_have_accepted_server_descriptor() able to
handle non-default values of PublishServerDescriptor.


Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2007-09-21 21:57:33 UTC (rev 11568)
+++ tor/trunk/src/or/directory.c	2007-09-21 22:14:39 UTC (rev 11569)
@@ -190,8 +190,9 @@
 directories_have_accepted_server_descriptor(void)
 {
   smartlist_t *servers = router_get_trusted_dir_servers();
+  or_options_t *options = get_options();
   SMARTLIST_FOREACH(servers, trusted_dir_server_t *, d, {
-    if ((d->type & (V1_AUTHORITY|V2_AUTHORITY)) &&
+    if ((d->type & options->_PublishServerDescriptor) &&
         !d->has_accepted_serverdesc) {
       return 0;
     }