Tweak bug6783 patch.

diff --git a/src/or/config.c b/src/or/config.c
index 7e020b8638b662991e34c21273c611db9eeba27a..1337056f5d57938c7457853565ae0565ced95aab 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2380,6 +2380,10 @@ options_validate(or_options_t *old_options, or_options_t *options,
     REJECT("TokenBucketRefillInterval must be between 1 and 1000 inclusive.");
   }
 
+  if (options->DisableV2DirectoryInfo_ && ! authdir_mode(options)) {
+    REJECT("DisableV2DirectoryInfo_ set, but we aren't an authority.");
+  }
+
   if (options->ExcludeExitNodes || options->ExcludeNodes) {
     options->ExcludeExitNodesUnion_ = routerset_new();
     routerset_union(options->ExcludeExitNodesUnion_,options->ExcludeExitNodes);

diff --git a/src/or/or.h b/src/or/or.h
index 0f5dbd6ad55adf08dfd1be7f0bc9c1755b966580..c2cd8a6caeb237bdeb6375e415d213ddd7894117 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4005,7 +4005,8 @@ typedef struct {
    * make it temporarily disableable, in order to do fast testing and be
    * able to turn it back on if it turns out to be non-workable.
    *
-   * XXXX024 Don't actually leave this in.
+   * XXXX025 Make this always-on, or always-off.  Right now, it's only
+   * enableable for authorities.
    */
   int DisableV2DirectoryInfo_;