[2544] Replace invalid AND with OR operators.

This fixes the omission in previous commit.

[2544] Replace invalid AND with OR operators.
This fixes the omission in previous commit.
667d94d9 · Marcin Siodelski · fdce9eb7 · 667d94d9
Commit 667d94d9 authored Dec 19, 2012 by Marcin Siodelski
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

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

No files found.
--- a/src/bin/dhcp6/config_parser.cc
+++ b/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)) {