summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-03-17 23:21:42 +0000
committerRoger Dingledine <arma@torproject.org>2006-03-17 23:21:42 +0000
commitc7839a17f5b30a36bc441aee6c625cf2392be880 (patch)
tree2778173a00e6cec8e20ea6d3a1f3998cf08a15e9
parent51fc6799add857bfad67e73af59db34fbefa4581 (diff)
downloadtor-c7839a17f5b30a36bc441aee6c625cf2392be880.tar.gz
tor-c7839a17f5b30a36bc441aee6c625cf2392be880.zip
when we're an auth dir server but don't claim to be a versioning
auth dir server, don't demand that we define RecommendedVersions. svn:r6180
-rw-r--r--src/or/config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 436c2f6183..cc4d435a6d 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2172,8 +2172,8 @@ options_validate(or_options_t *old_options, or_options_t *options,
if (options->AuthoritativeDir) {
if (!options->ContactInfo)
REJECT("Authoritative directory servers must set ContactInfo");
- if (!options->RecommendedVersions)
- REJECT("Authoritative directory servers must set RecommendedVersions.");
+ if (VersioningAuthoritativeDir && !options->RecommendedVersions)
+ REJECT("Versioning auth dir servers must set RecommendedVersions.");
if (!options->RecommendedClientVersions)
options->RecommendedClientVersions =
config_lines_dup(options->RecommendedVersions);