From: Marcin Siodelski <marcin@isc.org>
Date: Wed, 2 Sep 2015 16:20:47 +0000 (+0200)
Subject: [master] Merge branch 'trac3947'
X-Git-Tag: trac3238_base~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c06ab97a4e068c4b4b11f4685c56dd402b2385dc;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3947'
---

c06ab97a4e068c4b4b11f4685c56dd402b2385dc
diff --cc src/bin/dhcp6/dhcp6_messages.mes
index 28cacdefa7,acdc88884f..4cdf7eb302
--- a/src/bin/dhcp6/dhcp6_messages.mes
+++ b/src/bin/dhcp6/dhcp6_messages.mes
@@@ -224,28 -224,6 +224,10 @@@ as a result of receiving SIGHUP signal
  This is an error message logged when the dynamic reconfiguration of the
  DHCP server failed.
  
- % DHCP6_EXTEND_NA_UNKNOWN %1: received unknown IA_NA with iaid=%2 in subnet %3
- This warning message is printed when client attempts to extend the lease
- for the address (in the IA_NA option) but no such lease is known by the server.
- It typically means that client has attempted to use its lease past its
- lifetime: causes of this include a adjustment of the client's date/time
- setting or poor support on the client for sleep/recovery. A properly
- implemented client will recover from such a situation by restarting the
- lease allocation process after receiving a negative reply from the server.
- The first argument includes the client and the transaction identification
- information. The second argument holds IAID. The third argument holds the
- subnet information.
- 
- An alternative cause could be that the server has lost its database
- recently and does not recognize its well-behaving clients. This is more
- probable if you see many such messages. Clients will recover from this,
- but they will most likely get a different IP addresses and experience
- a brief service interruption.
- 
 +% DHCP6_HANDLE_SIGNAL_EXCEPTION An exception was thrown while handing signal: %1
 +This error message is printed when an exception was raised during signal
 +processing. This likely indicates a coding error and should be reported to ISC.
 +
  % DHCP6_HOOKS_LIBS_RELOAD_FAIL reload of hooks libraries failed
  A "libreload" command was issued to reload the hooks libraries but for
  some reason the reload failed.  Other error messages issued from the
diff --cc src/bin/dhcp6/dhcp6_srv.cc
index 133fb3a380,82cb272ebb..639be48038
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@@ -494,10 -479,10 +494,10 @@@ bool Dhcpv6Srv::run() 
              continue;
          }
  
 -        LOG_DEBUG(packet_logger, DBG_DHCP6_BASIC_DATA, DHCP6_PACKET_RECEIVED)
 +        LOG_DEBUG(packet6_logger, DBG_DHCP6_BASIC_DATA, DHCP6_PACKET_RECEIVED)
              .arg(query->getLabel())
              .arg(query->getName())
-             .arg(query->getType())
+             .arg(static_cast<int>(query->getType()))
              .arg(query->getRemoteAddr())
              .arg(query->getLocalAddr())
              .arg(query->getIface());