[or-cvs] Actually, only v1 auth dir servers need to define recommend...

[arma at seul.org]

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

Modified Files:
	config.c 
Log Message:
Actually, only v1 auth dir servers need to define recommendedversions.
But versioning dirservers do need to cause recommendclientversions
and recommendedserverversions to somehow be non-empty.


Index: config.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/config.c,v
retrieving revision 1.533
retrieving revision 1.534
diff -u -p -d -r1.533 -r1.534
--- config.c	17 Mar 2006 23:21:42 -0000	1.533
+++ config.c	17 Mar 2006 23:25:40 -0000	1.534
@@ -2172,14 +2172,18 @@ options_validate(or_options_t *old_optio
   if (options->AuthoritativeDir) {
     if (!options->ContactInfo)
       REJECT("Authoritative directory servers must set ContactInfo");
-    if (VersioningAuthoritativeDir && !options->RecommendedVersions)
-      REJECT("Versioning auth dir servers must set RecommendedVersions.");
+    if (options->V1AuthoritativeDir && !options->RecommendedVersions)
+      REJECT("V1 auth dir servers must set RecommendedVersions.");
     if (!options->RecommendedClientVersions)
       options->RecommendedClientVersions =
         config_lines_dup(options->RecommendedVersions);
     if (!options->RecommendedServerVersions)
       options->RecommendedServerVersions =
         config_lines_dup(options->RecommendedVersions);
+    if (options->VersioningAuthoritativeDir &&
+        (!options->RecommendedClientVersions ||
+         !options->RecommendedServerVersions))
+      REJECT("Versioning auth dir servers must set Recommended*Versions.");
     if (options->UseEntryGuards) {
       log_info(LD_CONFIG, "Authoritative directory servers can't set "
                "UseEntryGuards. Disabling.");