From c5a5161fb5d7a71c477b857db6f206bd2d560e5c Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Mon, 2 Jan 2006 08:40:58 +0000
Subject: [PATCH] prevent auth dir servers from enabling entry nodes.

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

diff --git a/src/or/config.c b/src/or/config.c
index cef5be524f..562cad22e0 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1905,6 +1905,11 @@ options_validate(or_options_t *old_options, or_options_t *options)
     if (!options->RecommendedServerVersions)
       options->RecommendedServerVersions =
         config_lines_dup(options->RecommendedVersions);
+    if (options->UseEntryNodes) {
+      notice(LD_CONFIG, "Authoritative directory servers can't set "
+             "UseEntryNodes. Disabling.");
+      options->UseEntryNodes = 0;
+    }
   }
 
   if (options->AuthoritativeDir && !options->DirPort)