BIND 10 master, updated. fe7a9d0719b8ed30956d78f5564d8bd69ae3f9e3 Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  fe7a9d0719b8ed30956d78f5564d8bd69ae3f9e3 (commit)
       via  6672a4b36293b3959afbbd46accda352402d9436 (commit)
      from  8190099591a5d3f4442f4235fee65a4a0800083a (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 fe7a9d0719b8ed30956d78f5564d8bd69ae3f9e3
Merge: 6672a4b36293b3959afbbd46accda352402d9436 8190099591a5d3f4442f4235fee65a4a0800083a
Author: Jelte Jansen <jelte at isc.org>
Date:   Tue Mar 15 17:55:25 2011 +0100

    Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10

commit 6672a4b36293b3959afbbd46accda352402d9436
Author: Jelte Jansen <jelte at isc.org>
Date:   Tue Mar 15 17:54:17 2011 +0100

    [master] test build fixes
    
    - need stdlib.h for random()
    - need return even after assert()
    - cppcheck mentioned a few args that could be passed by reference

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

Summary of changes:
 src/lib/nsas/glue_hints.cc               |    4 ++++
 src/lib/nsas/nameserver_address_store.cc |    2 +-
 src/lib/nsas/nameserver_address_store.h  |    2 +-
 src/lib/nsas/zone_entry.cc               |    2 +-
 src/lib/nsas/zone_entry.h                |    2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/nsas/glue_hints.cc b/src/lib/nsas/glue_hints.cc
index 96ef1a0..297eea7 100644
--- a/src/lib/nsas/glue_hints.cc
+++ b/src/lib/nsas/glue_hints.cc
@@ -14,6 +14,8 @@
 
 #include "glue_hints.h"
 
+#include <stdlib.h>
+
 #include <dns/rrset.h>
 #include <dns/rdata.h>
 #include <dns/rrtype.h>
@@ -122,6 +124,8 @@ GlueHints::getGlue(AddressFamily family) const {
     } else {
         // Unknown family
         assert(false);
+        // Some compilers want something returned anyway
+        return NameserverAddress();
     }
 }
 
diff --git a/src/lib/nsas/nameserver_address_store.cc b/src/lib/nsas/nameserver_address_store.cc
index 406f782..ae543c3 100644
--- a/src/lib/nsas/nameserver_address_store.cc
+++ b/src/lib/nsas/nameserver_address_store.cc
@@ -82,7 +82,7 @@ newZone(
 void
 NameserverAddressStore::lookup(const string& zone, const RRClass& class_code,
     boost::shared_ptr<AddressRequestCallback> callback, AddressFamily family,
-    const GlueHints glue_hints)
+    const GlueHints& glue_hints)
 {
     pair<bool, boost::shared_ptr<ZoneEntry> > zone_obj(zone_hash_->getOrAdd(HashKey(
         zone, class_code), boost::bind(newZone, &resolver_, &zone, &class_code,
diff --git a/src/lib/nsas/nameserver_address_store.h b/src/lib/nsas/nameserver_address_store.h
index b8080f2..7cbf831 100644
--- a/src/lib/nsas/nameserver_address_store.h
+++ b/src/lib/nsas/nameserver_address_store.h
@@ -86,7 +86,7 @@ public:
     /// \param family Which address is requested.
     void lookup(const std::string& zone, const dns::RRClass& class_code,
         boost::shared_ptr<AddressRequestCallback> callback, AddressFamily
-        family = ANY_OK, const GlueHints = GlueHints());
+        family = ANY_OK, const GlueHints& = GlueHints());
 
     /// \brief cancel the given lookup action
     ///
diff --git a/src/lib/nsas/zone_entry.cc b/src/lib/nsas/zone_entry.cc
index ece00c0..6d9c397 100644
--- a/src/lib/nsas/zone_entry.cc
+++ b/src/lib/nsas/zone_entry.cc
@@ -225,7 +225,7 @@ class ZoneEntry::ResolverCallback :
 
 void
 ZoneEntry::addCallback(CallbackPtr callback, AddressFamily family,
-                       const GlueHints glue_hints) {
+                       const GlueHints& glue_hints) {
     Lock lock(mutex_);
 
     bool ask(false);
diff --git a/src/lib/nsas/zone_entry.h b/src/lib/nsas/zone_entry.h
index 7b29bb0..7d8651f 100644
--- a/src/lib/nsas/zone_entry.h
+++ b/src/lib/nsas/zone_entry.h
@@ -104,7 +104,7 @@ public:
      */
     void addCallback(boost::shared_ptr<AddressRequestCallback>
         callback, AddressFamily family,
-        const GlueHints glue_hints = GlueHints());
+        const GlueHints& glue_hints = GlueHints());
 
     /**
      * \short Remove a callback from the list