diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-06 15:19:04 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2013-03-10 20:31:58 -0400 |
| commit | 926b3d77f18d2345a70f953560f5a5312992aa73 (patch) | |
| tree | 5957ee6092356e9e4b4916be4fb1def9fdc9da41 | |
| parent | e4614d30e58007be1d44613d039891b6f131f50f (diff) | |
| download | tor-926b3d77f18d2345a70f953560f5a5312992aa73.tar.gz tor-926b3d77f18d2345a70f953560f5a5312992aa73.zip | |
Tweak bug6783 patch.
| -rw-r--r-- | src/or/config.c | 4 | ||||
| -rw-r--r-- | src/or/or.h | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index 7e020b8638..1337056f5d 100644 --- 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 0f5dbd6ad5..c2cd8a6cae 100644 --- 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_; |