From: Chris Ball <chris@printf.net>
Date: Sat, 31 Jul 2010 23:42:29 +0000 (-0400)
Subject: Bug #928: Disallow BridgeRelay 1 and ORPort 0 configuration
X-Git-Tag: tor-0.2.2.15-alpha~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ffa9779819bfba33a6a9fdd888aeb52c99d00d9;p=thirdparty%2Ftor.git

Bug #928: Disallow BridgeRelay 1 and ORPort 0 configuration
---

diff --git a/changes/bug928 b/changes/bug928
new file mode 100644
index 0000000000..4f9fc5fe35
--- /dev/null
+++ b/changes/bug928
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Disallow BridgeRelay 1 and ORPort 0 configuration.
+      Bugfix in 0.2.0.13-alpha, closes bug 928.
+
diff --git a/src/or/config.c b/src/or/config.c
index fc8455656b..20ae9f072f 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3590,6 +3590,9 @@ options_validate(or_options_t *old_options, or_options_t *options,
         }
     });
 
+  if (options->BridgeRelay == 1 && options->ORPort == 0)
+      REJECT("BridgeRelay is 1, ORPort is 0. This is an invalid combination.");
+
   return 0;
 #undef REJECT
 #undef COMPLAIN