[or-cvs] [tor/master] Bug #928: Disallow BridgeRelay 1 and ORPort 0 configuration

[nickm@xxxxxxxxxxxxxx]

Author: Chris Ball <chris@xxxxxxxxxx>
Date: Sat, 31 Jul 2010 19:42:29 -0400
Subject: Bug #928: Disallow BridgeRelay 1 and ORPort 0 configuration
Commit: 9ffa9779819bfba33a6a9fdd888aeb52c99d00d9

---
 changes/bug928  |    4 ++++
 src/or/config.c |    3 +++
 2 files changed, 7 insertions(+), 0 deletions(-)
 create mode 100644 changes/bug928

diff --git a/changes/bug928 b/changes/bug928
new file mode 100644
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 fc84556..20ae9f0 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
-- 
1.7.1