BIND 10 master, updated. 52f22bb0132d78d07145fec0f1fde03069f7e5fa [master] Merge branch 'trac2702' (DHCPv4 renewal without client-id)

[BIND 10 source code commits]

The branch, master has been updated
       via  52f22bb0132d78d07145fec0f1fde03069f7e5fa (commit)
       via  72106475f625075e3e49bdba04e6f9f26b105294 (commit)
       via  daf2abe68ce9c111334a15c14e440730f3a085e2 (commit)
      from  5aa5b4e403893b1de767cea00b4a3f9d9a17422e (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 52f22bb0132d78d07145fec0f1fde03069f7e5fa
Merge: 5aa5b4e 7210647
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Mon Feb 11 15:54:27 2013 +0100

    [master] Merge branch 'trac2702' (DHCPv4 renewal without client-id)
    
    Conflicts:
    	ChangeLog

commit 72106475f625075e3e49bdba04e6f9f26b105294
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Mon Feb 11 15:36:42 2013 +0100

    [2702] ChangeLog updated.

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

Summary of changes:
 ChangeLog                       |    5 +++++
 src/lib/dhcpsrv/alloc_engine.cc |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index b835d41..4c0dcda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+570.	[bug]		tmark, marcin, tomek
+	b10-dhcp4: Address renewal now works properly for DHCPv4 clients
+	that do not send client ID.
+	(Trac #2702, git daf2abe68ce9c111334a15c14e440730f3a085e2)
+
 569.	[bug]		tomek
 	b10-dhcp4: Fix bug whereby a DHCP packet without a client ID
 	could crash the MySQL lease database backend.
diff --git a/src/lib/dhcpsrv/alloc_engine.cc b/src/lib/dhcpsrv/alloc_engine.cc
index 7a64dac..3602aac 100644
--- a/src/lib/dhcpsrv/alloc_engine.cc
+++ b/src/lib/dhcpsrv/alloc_engine.cc
@@ -274,7 +274,7 @@ AllocEngine::allocateAddress4(const SubnetPtr& subnet,
     }
 
     // Check if there's existing lease for that subnet/clientid/hwaddr combination.
-    Lease4Ptr existing = LeaseMgrFactory::instance().getLease4(hwaddr->hwaddr_, subnet->getID());
+    Lease4Ptr existing = LeaseMgrFactory::instance().getLease4(*hwaddr, subnet->getID());
     if (existing) {
         // We have a lease already. This is a returning client, probably after
         // its reboot.