From 09e852123631471de1ff0537ce2602b7d9585efa Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 2 Sep 2005 20:29:29 +0000
Subject: [PATCH] Make ContactInfo mandatory for authoritative directories.

svn:r4896
---
 src/or/config.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/or/config.c b/src/or/config.c
index 19a5f8b6f1..eb60352fa1 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1650,8 +1650,12 @@ options_validate(or_options_t *options)
   }
 
   if (options->AuthoritativeDir) {
+    if (!options->ContactInfo) {
+      log(LOG_WARN, "Authoritative directory servers must set ContactInfo");
+      result = -1;
+    }
     if (!options->RecommendedVersions) {
-      log(LOG_WARN, "Directory servers must configure RecommendedVersions.");
+      log(LOG_WARN, "Authoritative directory servers must configure RecommendedVersions.");
       result = -1;
     }
     if (!options->RecommendedClientVersions)