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

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();
     }
 }
 

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,

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
     ///

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);

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