BIND 10 master, updated. f5811cdff640338babcf1ca0b4cfc7a06580a4f5 [master] Test fix for ambiguous IPv6 notation (ending with :0 vs ::)

[BIND 10 source code commits]

The branch, master has been updated
       via  f5811cdff640338babcf1ca0b4cfc7a06580a4f5 (commit)
       via  723885f4ab0096dbea3a21f63badb18d79f28814 (commit)
      from  76fa5523da1da9778a686b39dbba5759dcea34da (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 f5811cdff640338babcf1ca0b4cfc7a06580a4f5
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Mon Oct 1 18:05:44 2012 +0200

    [master] Test fix for ambiguous IPv6 notation (ending with :0 vs ::)

commit 723885f4ab0096dbea3a21f63badb18d79f28814
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Mon Oct 1 18:05:06 2012 +0200

    [master] Added missing header (Solaris compilation fix)

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

Summary of changes:
 src/lib/dhcp/addr_utilities.cc                |    1 +
 src/lib/dhcp/tests/addr_utilities_unittest.cc |   14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dhcp/addr_utilities.cc b/src/lib/dhcp/addr_utilities.cc
index e827fc2..ad72833 100644
--- a/src/lib/dhcp/addr_utilities.cc
+++ b/src/lib/dhcp/addr_utilities.cc
@@ -12,6 +12,7 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
+#include <string.h>
 #include <dhcp/addr_utilities.h>
 
 using namespace isc::asiolink;
diff --git a/src/lib/dhcp/tests/addr_utilities_unittest.cc b/src/lib/dhcp/tests/addr_utilities_unittest.cc
index 46207b2..8382827 100644
--- a/src/lib/dhcp/tests/addr_utilities_unittest.cc
+++ b/src/lib/dhcp/tests/addr_utilities_unittest.cc
@@ -64,15 +64,15 @@ TEST(Pool6Test, lastAddrInPrefix) {
 }
 
 TEST(Pool6Test, firstAddrInPrefix) {
-    IOAddress addr1("2001:db8:1:1234:5678:abcd:1234:beef");
+    IOAddress addr1("2001:db8:1:1234:5678:1234:abcd:beef");
 
     // Prefixes rounded to nibbles are easy...
-    EXPECT_EQ("2001:db8:1:1234:5678:abcd:1234:0",
-              firstAddrInPrefix(addr1, 112).toText());
-    EXPECT_EQ("2001:db8:1:1234:5678:abcd:1230:0",
-              firstAddrInPrefix(addr1, 108).toText());
-    EXPECT_EQ("2001:db8:1:1234:5678:abcd:1200:0",
-              firstAddrInPrefix(addr1, 104).toText());
+    EXPECT_EQ("2001:db8:1:1234:5678:1234::",
+              firstAddrInPrefix(addr1, 96).toText());
+    EXPECT_EQ("2001:db8:1:1234:5678:1230::",
+              firstAddrInPrefix(addr1, 92).toText());
+    EXPECT_EQ("2001:db8:1:1234:5678:1200::",
+              firstAddrInPrefix(addr1, 88).toText());
     EXPECT_EQ("2001:db8:1:1234::",
               firstAddrInPrefix(addr1, 64).toText());