BIND 10 master, updated. 5bb1a0ebbed603d81656d5e87196191f1b00aad5 Compilation fix for NetBSD and gcc on Solaris 10

[BIND 10 source code commits]

The branch, master has been updated
       via  5bb1a0ebbed603d81656d5e87196191f1b00aad5 (commit)
      from  fd5db1f7aa6f49091b4e66193b0379679eede4c4 (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 5bb1a0ebbed603d81656d5e87196191f1b00aad5
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Mon Oct 17 20:17:34 2011 +0200

    Compilation fix for NetBSD and gcc on Solaris 10

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

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

-----------------------------------------------------------------------
diff --git a/src/lib/dhcp/libdhcp.cc b/src/lib/dhcp/libdhcp.cc
index 019367f..8e6314e 100644
--- a/src/lib/dhcp/libdhcp.cc
+++ b/src/lib/dhcp/libdhcp.cc
@@ -101,8 +101,8 @@ LibDHCP::packOptions6(boost::shared_array<uint8_t> data,
         }
     }
     catch (const Exception& e) {
-        cout << "Packet build failed." << endl;
-        return (-1);
+        cout << "Packet build failed (Option build failed)." << endl;
+        throw;
     }
     return (offset);
 }
diff --git a/src/lib/dhcp/tests/option6_ia_unittest.cc b/src/lib/dhcp/tests/option6_ia_unittest.cc
index ab949de..ac4127a 100644
--- a/src/lib/dhcp/tests/option6_ia_unittest.cc
+++ b/src/lib/dhcp/tests/option6_ia_unittest.cc
@@ -248,7 +248,8 @@ TEST_F(Option6IATest, suboptions_unpack) {
 
     EXPECT_EQ(0xcafe, subopt->getType());
     EXPECT_EQ(4, subopt->len());
-    EXPECT_EQ(NULL, subopt->getData());
+    // there should be no data at all
+    EXPECT_EQ(static_cast<void*>(NULL), subopt->getData());
 
     subopt = ia->getOption(1); // get option 1
     ASSERT_FALSE(subopt); // should be NULL