Bläddra i källkod

Bug #928: Disallow BridgeRelay 1 and ORPort 0 configuration

Chris Ball 15 år sedan
förälder
incheckning
9ffa977981
2 ändrade filer med 7 tillägg och 0 borttagningar
  1. 4 0
      changes/bug928
  2. 3 0
      src/or/config.c

+ 4 - 0
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.
+

+ 3 - 0
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