From: Roger Dingledine <arma@torproject.org>
Date: Fri, 10 Apr 2009 07:02:19 +0000 (+0000)
Subject: commit sebastian's patch to not require contactinfo when testingtornetwork
X-Git-Tag: tor-0.2.1.14-rc~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c4145e5390980cd7fb1e6f0777e9df6bf3e7639e;p=thirdparty%2Ftor.git

commit sebastian's patch to not require contactinfo when testingtornetwork
is set


svn:r19257
---

diff --git a/src/or/config.c b/src/or/config.c
index 6b89eceb5a..caf018d27f 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3039,7 +3039,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
   }
 
   if (options->AuthoritativeDir) {
-    if (!options->ContactInfo)
+    if (!options->ContactInfo && !options->TestingTorNetwork)
       REJECT("Authoritative directory servers must set ContactInfo");
     if (options->V1AuthoritativeDir && !options->RecommendedVersions)
       REJECT("V1 auth dir servers must set RecommendedVersions.");