[or-cvs] when we"re an auth dir server but don"t claim to be a versi...

arma at seul.org arma at seul.org
Fri Mar 17 23:21:44 UTC 2006


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:
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.


Index: config.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/config.c,v
retrieving revision 1.532
retrieving revision 1.533
diff -u -p -d -r1.532 -r1.533
--- config.c	17 Mar 2006 23:19:51 -0000	1.532
+++ config.c	17 Mar 2006 23:21:42 -0000	1.533
@@ -2172,8 +2172,8 @@ options_validate(or_options_t *old_optio
   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);



More information about the tor-commits mailing list