From: Tomek Mrugalski <tomasz@isc.org>
Date: Thu, 27 Feb 2014 17:32:43 +0000 (+0100)
Subject: [master] Merge branch 'trac3343' (DHCPv4 client classification fix)
X-Git-Tag: bind10-1.2.0beta1-release~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b78dc55330b08c2a71367c9bb45c82bd4e08c4ae;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3343' (DHCPv4 client classification fix)

Conflicts:
	ChangeLog
---

b78dc55330b08c2a71367c9bb45c82bd4e08c4ae
diff --cc ChangeLog
index c538df249c,e74645466b..da8db07668
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,16 -1,7 +1,21 @@@
 -7XX.	[bug]		tomek
++764.	[bug]		tomek
+ 	b10-dhcp4: Fixed a bug caused client classification to not work
+ 	properly.
 -	(Trac #3343, git abcd)
++	(Trac #3343, git 1801400ac874380e7a565d373b4bae96a49e21f7)
++
 +763.	[func]		tmark
 +	b10-dhcp-ddns may now be configured to disable DNS updates in
 +	in a given direction by simply not defining any domains for that
 +	direction in its configuration.  This allows it to be configured to
 +	support either forward DNS or reverse DNS only.  Prior to this if
 +	a request was received that could not be matched to servers in a
 +	given direction it was failed immediately.
 +	(Trac #3341, git 01f26bce1d9faaddb8be59802f73891ea065b200)
 +
 +762.	[func]		tmark
 +	If configured to do so, b10-dhcp6 will now create DHCP-DDNS update
 +	requests and send them to b10-dhcp-ddns for processing.
 +	(Trac# 3329, git 239956696465a13196a2b6bc0f3a61aed21a5de8)
  
  761.	[doc]		stephen, jreed
  	Added "man" page for perfdhcp.