summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-09-21 22:14:39 +0000
committerRoger Dingledine <arma@torproject.org>2007-09-21 22:14:39 +0000
commit523ac934de79b0cf23482bf19656cbcd615eb12b (patch)
treeb3bfeae2899a3593f4791cdfd34f90d9e723e66b
parent41f3d0eb272aefa1dd583946b62f085cdf9a7b57 (diff)
downloadtor-523ac934de79b0cf23482bf19656cbcd615eb12b.tar.gz
tor-523ac934de79b0cf23482bf19656cbcd615eb12b.zip
make directories_have_accepted_server_descriptor() able to
handle non-default values of PublishServerDescriptor. svn:r11569
-rw-r--r--src/or/directory.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/directory.c b/src/or/directory.c
index 28612a9415..a5af3d6986 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -190,8 +190,9 @@ int
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;
}