BIND 10 trac1959, updated. 58131685191d678f16320f532d86ddc2a90211ce [1959] Small fix in logical operator.

[BIND 10 source code commits]

The branch, trac1959 has been updated
       via  58131685191d678f16320f532d86ddc2a90211ce (commit)
      from  f6ef8ec398f1711245c25eeb30887fe4de18641f (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 58131685191d678f16320f532d86ddc2a90211ce
Author: Marcin Siodelski <marcin at isc.org>
Date:   Thu Sep 6 12:24:23 2012 +0200

    [1959] Small fix in logical operator.

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

Summary of changes:
 tests/tools/perfdhcp/test_control.cc               |    2 +-
 .../tools/perfdhcp/tests/test_control_unittest.cc  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/tests/tools/perfdhcp/test_control.cc b/tests/tools/perfdhcp/test_control.cc
index de7579d..ef970a7 100644
--- a/tests/tools/perfdhcp/test_control.cc
+++ b/tests/tools/perfdhcp/test_control.cc
@@ -278,7 +278,7 @@ TestControl::factoryIana6(Option::Universe, uint16_t,
     // @todo allow different values of T1, T2 and IAID.
     const uint8_t buf_array[] = {
         0, 0, 0, 1,                     // IAID = 1
-        0, 0, 3600 >> 8, 3600 && 0xff,  // T1 = 3600
+        0, 0, 3600 >> 8, 3600 & 0xff,  // T1 = 3600
         0, 0, 5400 >> 8, 5400 & 0xff,   // T2 = 5400
     };
     OptionBuffer buf_ia_na(buf_array, buf_array + sizeof(buf_array));
diff --git a/tests/tools/perfdhcp/tests/test_control_unittest.cc b/tests/tools/perfdhcp/tests/test_control_unittest.cc
index 06dc3e5..e5dbaf1 100644
--- a/tests/tools/perfdhcp/tests/test_control_unittest.cc
+++ b/tests/tools/perfdhcp/tests/test_control_unittest.cc
@@ -795,7 +795,7 @@ TEST_F(TestControlTest, Options6) {
     // Every IA_NA option is expected to start with this sequence.
     const uint8_t opt_ia_na_array[] = {
         0, 0, 0, 1,                     // IAID = 1
-        0, 0, 3600 >> 8, 3600 && 0xff,  // T1 = 3600
+        0, 0, 3600 >> 8, 3600 & 0xff,  // T1 = 3600
         0, 0, 5400 >> 8, 5400 & 0xff,   // T2 = 5400
     };
     OptionBuffer opt_ia_na_ref(opt_ia_na_array,