[or-cvs] actually, if recommendedversions is required for dirservers,

[arma@seul.org (Roger Dingledine)]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or

Modified Files:
	config.c 
Log Message:
actually, if recommendedversions is required for dirservers,
then require it.


Index: config.c
===================================================================
RCS file: /home/or/cvsroot/src/or/config.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- config.c	10 Mar 2004 07:02:56 -0000	1.92
+++ config.c	10 Mar 2004 07:44:31 -0000	1.93
@@ -377,7 +377,7 @@
   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 @@
     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.");