From 12f31867190bde6fb2c4ff169d343e7bff00a503 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 22 Nov 2010 13:12:48 -0500
Subject: Disable DirPort when BridgeRelay is set

---
 src/or/config.c | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/or/config.c')

diff --git a/src/or/config.c b/src/or/config.c
index e3d5e606f9..bd8c45758b 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3281,6 +3281,12 @@ options_validate(or_options_t *old_options, or_options_t *options,
            "PublishServerDescriptor line.");
   }
 
+  if (options->BridgeRelay && options->DirPort) {
+    log_warn(LD_CONFIG, "Can't set a DirPort on a bridge relay; disabling "
+             "DirPort");
+    options->DirPort = 0;
+  }
+
   if (options->MinUptimeHidServDirectoryV2 < 0) {
     log_warn(LD_CONFIG, "MinUptimeHidServDirectoryV2 option must be at "
                         "least 0 seconds. Changing to 0.");
-- 
cgit v1.2.3-54-g00ecf