[or-cvs] [tor/release-0.2.2] Disable DirPort when BridgeRelay is set

[arma@xxxxxxxxxxxxxx]

commit 12f31867190bde6fb2c4ff169d343e7bff00a503
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Nov 22 13:12:48 2010 -0500

    Disable DirPort when BridgeRelay is set
---
 changes/bug2060 |    4 ++++
 src/or/config.c |    6 ++++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/changes/bug2060 b/changes/bug2060
new file mode 100644
index 0000000..eb95aed
--- /dev/null
+++ b/changes/bug2060
@@ -0,0 +1,4 @@
+  o Minor features
+    - Make sure to disable DirPort if running as a bridge.  DirPorts aren't
+      used on bridges, and it makes bridge scanning way too easy.
+
diff --git a/src/or/config.c b/src/or/config.c
index e3d5e60..bd8c457 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.");