[or-cvs] Make ContactInfo mandatory for authoritative directories.

[Nick Mathewson]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv10204/src/or

Modified Files:
	config.c 
Log Message:
Make ContactInfo mandatory for authoritative directories.

Index: config.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/config.c,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -d -r1.402 -r1.403
--- config.c	26 Aug 2005 23:22:27 -0000	1.402
+++ config.c	2 Sep 2005 20:29:29 -0000	1.403
@@ -1650,8 +1650,12 @@
   }
 
   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)