BIND 10 master, updated. 0960094a732dde31e21013c2f2ada3c2077eaf6e [master] excluded DHCP related stuff from Makefile's

[BIND 10 source code commits]

The branch, master has been updated
       via  0960094a732dde31e21013c2f2ada3c2077eaf6e (commit)
       via  14a18f32396b316df44b68b21c79c073d1cbadd5 (commit)
      from  5b68f13805548425c66ce562688933f99700ed9b (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 0960094a732dde31e21013c2f2ada3c2077eaf6e
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri May 11 22:08:02 2012 +0000

    [master] excluded DHCP related stuff from Makefile's
    
    as a temporary workaround for build failure due to ifmgr problems.

commit 14a18f32396b316df44b68b21c79c073d1cbadd5
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri May 11 21:48:04 2012 +0000

    [master] be sure to include cstring for memcpy, and add std:: for it.
    
    committing at my discretion.

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

Summary of changes:
 src/bin/Makefile.am               |    3 ++-
 src/lib/Makefile.am               |    3 ++-
 src/lib/cryptolink/crypto_hmac.cc |    4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 499e209..4f602a9 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS = bind10 bindctl cfgmgr ddns loadzone msgq host cmdctl auth xfrin \
-	xfrout usermgr zonemgr stats tests resolver sockcreator dhcp4 dhcp6 dbutil
+        xfrout usermgr zonemgr stats tests resolver sockcreator dbutil
+#	xfrout usermgr zonemgr stats tests resolver sockcreator dhcp4 dhcp6 dbutil
 
 check-recursive: all-recursive
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 9ebd541..499a71a 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,3 +1,4 @@
 SUBDIRS = exceptions util log cryptolink dns cc config acl xfr bench \
           asiolink asiodns nsas cache resolve testutils datasrc \
-          server_common python dhcp statistics
+          server_common python statistics
+#          server_common python dhcp statistics
diff --git a/src/lib/cryptolink/crypto_hmac.cc b/src/lib/cryptolink/crypto_hmac.cc
index 277b036..c1bbfa8 100644
--- a/src/lib/cryptolink/crypto_hmac.cc
+++ b/src/lib/cryptolink/crypto_hmac.cc
@@ -23,6 +23,8 @@
 #include <botan/hash.h>
 #include <botan/types.h>
 
+#include <cstring>
+
 namespace {
 const char*
 getBotanHashAlgorithmName(isc::cryptolink::HashAlgorithm algorithm) {
@@ -155,7 +157,7 @@ public:
             if (output_size > len) {
                 output_size = len;
             }
-            memcpy(result, b_result.begin(), output_size);
+            std::memcpy(result, b_result.begin(), output_size);
         } catch (const Botan::Exception& exc) {
             isc_throw(isc::cryptolink::LibraryError, exc.what());
         }