]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[2544] Replace invalid AND with OR operators.
authorMarcin Siodelski <marcin@isc.org>
Wed, 19 Dec 2012 12:54:49 +0000 (13:54 +0100)
committerMarcin Siodelski <marcin@isc.org>
Wed, 19 Dec 2012 12:54:49 +0000 (13:54 +0100)
This fixes the omission in previous commit.

src/bin/dhcp6/config_parser.cc

index edda3121ec1639c5c8bc38790250bf53ea23ed81..944bb2141265a8a5bc4ee4c36e811ef07573728e 100644 (file)
@@ -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)) {