Browse Source

[2544] Replace invalid AND with OR operators.

This fixes the omission in previous commit.
Marcin Siodelski 12 years ago
parent
commit
667d94d937
1 changed files with 3 additions and 3 deletions
  1. 3 3
      src/bin/dhcp6/config_parser.cc

+ 3 - 3
src/bin/dhcp6/config_parser.cc

@@ -858,13 +858,13 @@ public:
 
             // Try uint32 type parser.
             if (!buildParser<Uint32Parser, Uint32Storage >(parser, uint32_values_,
-                                                           param.second) ||
+                                                           param.second) &&
                 // Try string type parser.
                 !buildParser<StringParser, StringStorage >(parser, string_values_,
-                                                           param.second) ||
+                                                           param.second) &&
                 // Try pool parser.
                 !buildParser<PoolParser, PoolStorage >(parser, pools_,
-                                                       param.second) ||
+                                                       param.second) &&
                 // Try option data parser.
                 !buildParser<OptionDataListParser, OptionStorage >(parser, options_,
                                                                    param.second)) {