BIND 10 trac2544, updated. 667d94d93788e24158ebbec640f006f49b7d438c [2544] Replace invalid AND with OR operators.

[BIND 10 source code commits]

The branch, trac2544 has been updated
       via  667d94d93788e24158ebbec640f006f49b7d438c (commit)
      from  fdce9eb73133bb52609ed6ad51fdb77b28447eb3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 667d94d93788e24158ebbec640f006f49b7d438c
Author: Marcin Siodelski <marcin at isc.org>
Date:   Wed Dec 19 13:54:49 2012 +0100

    [2544] Replace invalid AND with OR operators.
    
    This fixes the omission in previous commit.

-----------------------------------------------------------------------

Summary of changes:
 src/bin/dhcp6/config_parser.cc |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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