From: Marcin Siodelski <marcin@isc.org>
Date: Wed, 10 Jun 2015 12:52:26 +0000 (+0200)
Subject: [master] Merge branch 'trac3807'
X-Git-Tag: trac3732a_base~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c95ebdaf39c3d8d78d83d53db15824c60078f566;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3807'
---

c95ebdaf39c3d8d78d83d53db15824c60078f566
diff --cc src/bin/dhcp4/dhcp4_messages.mes
index eca75be40d,c3942d1416..1c5b36961e
--- a/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@@ -501,28 -493,32 +507,29 @@@ intervention (e.g. check if DHCP proces
  update the database). It may also be triggered if a lease was manually
  removed from the database during RELEASE message processing. The
  first argument includes the client and the transaction identification
- information. The second argument holds the IP address which release
+ information. The second argument holds the IPv4 address which release
  was attempted.
  
 +% DHCP4_RELEASE_FAIL_NO_SUBNET %1: client is trying to release a lease %2 from a subnet which cannot be selected.
 +This warning message indicates that client tried to release an address
 +from an improper location.  The first argument contains the client and
 +transaction identification information. The second argument contains
 +the address which the client is trying to release.
 +
  % DHCP4_RELEASE_FAIL_NO_LEASE %1: client is trying to release non-existing lease %2
  This debug message is printed when client attempts to release a lease,
  but no such lease is known to the server. The first argument contains
  the client and transaction identification information. The second
- argument contains the address which the client is trying to release.
+ argument contains the IPv4 address which the client is trying to
+ release.
  
 -% DHCP4_RELEASE_FAIL_WRONG_CLIENT_ID %1: client tried to release address %2, but this address is leased to different client using client id %3
 -This warning message indicates that client tried to release an address
 -that belongs to a different client. This should not happen in normal
 -circumstances and may indicate a misconfiguration of the client.  However,
 -since the client releasing the address will stop using it anyway, there
 -is a good chance that the situation will correct itself.
 -
 -% DHCP4_RELEASE_FAIL_WRONG_HWADDR %1: client tried to release address %2, but this address is leased to different client using HW address %3
 -This warning message indicates that client tried to release an address
 -that does belong to it, but the lease information was associated with
 -a different hardware address. One possible reason for using different
 -hardware address is that a cloned virtual machine was not updated and
 -both clones use the same client-id. The first argument includes the
 -client and the transaction identification information. The second
 -argument includes the IPv4 address which release was attempted. The
 -third argumnet includes the HW address of the lease owner.
 +% DHCP4_RELEASE_FAIL_WRONG_CLIENT %1: client is trying to release the lease %2 which belongs to a different client
 +This debug message is issued when a client is trying to release the
 +lease for the address which is currently used by another client, i.e.
 +the 'client identifier' or 'chaddr' doesn't match between the client
 +and the lease. The first argument includes the client and the
 +transaction identification information. The second argument specifies
 +the leased address.
  
  % DHCP4_RESPONSE_FQDN_DATA %1: including FQDN option in the server's response: %2
  This debug message is issued when the server is adding the Client FQDN
diff --cc src/bin/dhcp6/tests/dhcp6_test_utils.cc
index 8816aa53d0,1339efad95..b04f457228
--- a/src/bin/dhcp6/tests/dhcp6_test_utils.cc
+++ b/src/bin/dhcp6/tests/dhcp6_test_utils.cc
@@@ -14,10 -14,10 +14,11 @@@
  
  #include <config.h>
  #include <gtest/gtest.h>
+ #include <dhcp/option6_status_code.h>
  #include <dhcp6/tests/dhcp6_test_utils.h>
  #include <dhcp6/json_config_parser.h>
 -#include <config/ccsession.h>
 +#include <util/pointer_util.h>
 +#include <cc/command_interpreter.h>
  #include <string.h>
  
  using namespace isc::data;
diff --cc src/lib/dhcp/tests/pkt6_unittest.cc
index fe99bcb456,d015359765..3deefcf537
mode 100644,100755..100644
--- a/src/lib/dhcp/tests/pkt6_unittest.cc
+++ b/src/lib/dhcp/tests/pkt6_unittest.cc