mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-03 15:35:17 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
Tomek Mrugalski
2013-02-11 15:54:27 +01:00
parent 5aa5b4e403 72106475f6
commit 52f22bb013
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -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 569. [bug] tomek
b10-dhcp4: Fix bug whereby a DHCP packet without a client ID b10-dhcp4: Fix bug whereby a DHCP packet without a client ID
could crash the MySQL lease database backend. could crash the MySQL lease database backend.

2
src/lib/dhcpsrv/alloc_engine.cc
View File

@@ -274,7 +274,7 @@ AllocEngine::allocateAddress4(const SubnetPtr& subnet,
} }
// Check if there's existing lease for that subnet/clientid/hwaddr combination. // 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) { if (existing) {
// We have a lease already. This is a returning client, probably after // We have a lease already. This is a returning client, probably after
// its reboot. // its reboot.