BIND 10 master, updated. c6158690c389d75686545459618ae0bf16f2cdb8 [master] Merge branch 'trac2772'

[BIND 10 source code commits]

The branch, master has been updated
       via  c6158690c389d75686545459618ae0bf16f2cdb8 (commit)
       via  df4334a7eb130bb0322d271253c4ffe15485a2b7 (commit)
      from  03c2a0f0a538aa4f8bebe9678a23473e0a05ee3f (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 c6158690c389d75686545459618ae0bf16f2cdb8
Merge: 03c2a0f df4334a
Author: Marcin Siodelski <marcin at isc.org>
Date:   Wed Dec 11 09:35:11 2013 +0100

    [master] Merge branch 'trac2772'

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

Summary of changes:
 src/lib/dhcp/libdhcp++.cc                |    4 ++--
 src/lib/dhcp/tests/libdhcp++_unittest.cc |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dhcp/libdhcp++.cc b/src/lib/dhcp/libdhcp++.cc
index 4bc4a92..4577c64 100644
--- a/src/lib/dhcp/libdhcp++.cc
+++ b/src/lib/dhcp/libdhcp++.cc
@@ -163,9 +163,9 @@ LibDHCP::isStandardOption(const Option::Universe u, const uint16_t code) {
               code == 126 ||
               code == 127 ||
               (code > 146 && code < 150) ||
-              (code > 177  && code < 208) ||
+              (code > 177 && code < 208) ||
               (code > 213 && code <  220) ||
-              (code > 221 && code < 224))) {
+              (code > 221 && code < 255))) {
                 return (true);
             }
 
diff --git a/src/lib/dhcp/tests/libdhcp++_unittest.cc b/src/lib/dhcp/tests/libdhcp++_unittest.cc
index 92f7baf..ec9dd9f 100644
--- a/src/lib/dhcp/tests/libdhcp++_unittest.cc
+++ b/src/lib/dhcp/tests/libdhcp++_unittest.cc
@@ -643,7 +643,10 @@ TEST_F(LibDhcpTest, isStandardOption4) {
                                           187, 188, 189, 190, 191, 192, 193, 194, 195,
                                           196, 197, 198, 199, 200, 201, 202, 203, 204,
                                           205, 206, 207, 214, 215, 216, 217, 218, 219,
-                                          222, 223 };
+                                          222, 223, 224, 225, 226, 227, 228, 229, 230,
+                                          231, 232, 233, 234, 235, 236, 237, 238, 239,
+                                          240, 241, 242, 243, 244, 245, 246, 247, 248,
+                                          249, 250, 251, 252, 253, 254 };
     const size_t unassigned_num = sizeof(unassigned_codes) / sizeof(unassigned_codes[0]);
 
     // Try all possible option codes.