BIND 10 master, updated. 937c982cf30ed26570ca8853c45f8afe1a32e3e7 [master] DHCP4_SERVERID_LOADED and DHCP6_SERVERID_LOADED need server-id too

[BIND 10 source code commits]

The branch, master has been updated
       via  937c982cf30ed26570ca8853c45f8afe1a32e3e7 (commit)
      from  e6348b6115a2525de18a2d70c4b15fece46a9c90 (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 937c982cf30ed26570ca8853c45f8afe1a32e3e7
Author: Jeremy C. Reed <jreed at isc.org>
Date:   Wed Jan 30 09:35:48 2013 -0600

    [master] DHCP4_SERVERID_LOADED and DHCP6_SERVERID_LOADED need server-id too
    
    On my home system I received error when running unit tests like:
    
    Message DHCP4_SERVERID_LOADED server-id /home/reed/opt/bind10/var/b10-dhcp4-serverid has been loaded from file %2
    assertion ""Excess logger placeholders still exist in message" == NULL" failed: file "../../../../src/lib/log/log_formatter.cc", line 69, function "void isc::log::checkExcessPlaceholders(std::string*, unsigned int)"
    
    I am using --enable-logger-checks. The build farm also uses that.
    I am not sure why this was not seen  on the build farm.
    
    I added the missing value for dhcp4 and dhcp6 and the make check completed.
    
    It had slight review on jabber.

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

Summary of changes:
 src/bin/dhcp4/dhcp4_srv.cc |    1 +
 src/bin/dhcp6/dhcp6_srv.cc |    1 +
 2 files changed, 2 insertions(+)

-----------------------------------------------------------------------
diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index e1eba17..4538ad6 100644
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -61,6 +61,7 @@ Dhcpv4Srv::Dhcpv4Srv(uint16_t port, const char* dbconfig) {
         string srvid_file = CfgMgr::instance().getDataDir() + "/" + string(SERVER_ID_FILE);
         if (loadServerID(srvid_file)) {
             LOG_DEBUG(dhcp4_logger, DBG_DHCP4_START, DHCP4_SERVERID_LOADED)
+                .arg(srvidToString(getServerID()))
                 .arg(srvid_file);
         } else {
             generateServerID();
diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index 0468213..f7f7ca7 100644
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -78,6 +78,7 @@ Dhcpv6Srv::Dhcpv6Srv(uint16_t port)
         string duid_file = CfgMgr::instance().getDataDir() + "/" + string(SERVER_DUID_FILE);
         if (loadServerID(duid_file)) {
             LOG_DEBUG(dhcp6_logger, DBG_DHCP6_START, DHCP6_SERVERID_LOADED)
+                .arg(duidToString(getServerID()))
                 .arg(duid_file);
         } else {
             generateServerID();