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

Conflicts:
	ChangeLog

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.

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.