Commit 9ffa9779 authored by Chris Ball's avatar Chris Ball Committed by Nick Mathewson
Browse files

Bug #928: Disallow BridgeRelay 1 and ORPort 0 configuration

parent 600ba86f
Loading
Loading
Loading
Loading

changes/bug928

0 → 100644
+4 −0
Original line number Diff line number Diff line
  o Minor bugfixes:
    - Disallow BridgeRelay 1 and ORPort 0 configuration.
      Bugfix in 0.2.0.13-alpha, closes bug 928.
+3 −0
Original line number Diff line number Diff line
@@ -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