Bug #928: Disallow BridgeRelay 1 and ORPort 0 configuration

diff --git a/changes/bug928 b/changes/bug928
new file mode 100644 (file)
index 0000000..4f9fc5f
--- /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 fc8455656b676972308c7cc21b6aacf5ea2cfd5a..20ae9f072f435c654d0b7af024e8c3d8f61005f0 100644 (file)
--- 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