From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 13 May 2009 20:43:51 +0000 (-0400)
Subject: Use | with flags, not +.
X-Git-Tag: tor-0.2.1.15-rc~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a38ed1a235ef377993d5487fa2aa432abb2d2f2f;p=thirdparty%2Ftor.git

Use | with flags, not +.
---

diff --git a/src/or/config.c b/src/or/config.c
index 7c1b60dcf4..b696b23a4c 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3240,8 +3240,8 @@ options_validate(or_options_t *old_options, or_options_t *options,
 
   if ((options->BridgeRelay
         || options->_PublishServerDescriptor & BRIDGE_AUTHORITY)
-      && options->_PublishServerDescriptor
-        & (V1_AUTHORITY + V2_AUTHORITY + V3_AUTHORITY)) {
+      && (options->_PublishServerDescriptor
+          & (V1_AUTHORITY|V2_AUTHORITY|V3_AUTHORITY))) {
     REJECT("Bridges are not supposed to publish router descriptors to the "
            "directory authorities. Please correct your "
            "PublishServerDescriptor line.");