From: Roger Dingledine <arma@torproject.org>
Date: Wed, 10 Mar 2004 07:44:31 +0000 (+0000)
Subject: actually, if recommendedversions is required for dirservers,
X-Git-Tag: debian-version-0.0.1+0.0.2pre25-1~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e4f1f67facc76ec993b62288dbc26a8365b36f7;p=thirdparty%2Ftor.git

actually, if recommendedversions is required for dirservers,
then require it.


svn:r1253
---

diff --git a/src/or/config.c b/src/or/config.c
index 95668ec1ce..0b1005372e 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -377,7 +377,7 @@ static void init_options(or_options_t *options) {
   options->SocksBindAddress = tor_strdup("127.0.0.1");
   options->ORBindAddress = tor_strdup("0.0.0.0");
   options->DirBindAddress = tor_strdup("0.0.0.0");
-  options->RecommendedVersions = tor_strdup("[no recommended versions defined -- the dirserver must define this]");
+  options->RecommendedVersions = NULL;
   options->loglevel = LOG_INFO;
   options->PidFile = NULL; // tor_strdup("tor.pid");
   options->DataDirectory = NULL;
@@ -575,6 +575,11 @@ int getconfig(int argc, char **argv, or_options_t *options) {
     result = -1;
   }
 
+  if(options->DirPort && options->RecommendedVersions == NULL) {
+    log(LOG_WARN,"Directory servers must configure RecommendedVersions.");
+    result = -1;
+  }
+
   if(options->SocksPort > 1 &&
      (options->PathlenCoinWeight < 0.0 || options->PathlenCoinWeight >= 1.0)) {
     log(LOG_WARN,"PathlenCoinWeight option must be >=0.0 and <1.0.");