summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-05-13 16:43:51 -0400
committerNick Mathewson <nickm@torproject.org>2009-05-13 16:45:59 -0400
commita38ed1a235ef377993d5487fa2aa432abb2d2f2f (patch)
tree759e582e7c2039e6eaec85a996a0327bd75d3263
parent9e97067b2fc4032bce658d73cf21ee54573186bb (diff)
downloadtor-a38ed1a235ef377993d5487fa2aa432abb2d2f2f.tar.gz
tor-a38ed1a235ef377993d5487fa2aa432abb2d2f2f.zip
Use | with flags, not +.
-rw-r--r--src/or/config.c4
1 files changed, 2 insertions, 2 deletions
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.");