From: Marcin Siodelski <marcin@isc.org>
Date: Wed, 19 Dec 2012 12:54:49 +0000 (+0100)
Subject: [2544] Replace invalid AND with OR operators.
X-Git-Tag: bind10-1.0.0-beta-release~2^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=667d94d93788e24158ebbec640f006f49b7d438c;p=thirdparty%2Fkea.git

[2544] Replace invalid AND with OR operators.

This fixes the omission in previous commit.
---

diff --git a/src/bin/dhcp6/config_parser.cc b/src/bin/dhcp6/config_parser.cc
index edda3121ec..944bb21412 100644
--- 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)) {