From: Thomas Markwalder <tmark@isc.org>
Date: Thu, 28 Jul 2016 10:51:30 +0000 (-0400)
Subject: [master] find_lease() now ACKs reclaimed abandoned addresses
X-Git-Tag: v4_3_5b1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b797e44e97c606494018c5df6e57c9994a3a788;p=thirdparty%2Fdhcp.git

[master] find_lease() now ACKs reclaimed abandoned addresses

    Merges in rt41815a.
---

diff --git a/server/dhcp.c b/server/dhcp.c
index 915d1b1aa..c9b36325c 100644
--- a/server/dhcp.c
+++ b/server/dhcp.c
@@ -4562,6 +4562,7 @@ int find_lease (struct lease **lp,
 #if defined (DEBUG_FIND_LEASE)
 			log_info ("not choosing requested address (!).");
 #endif
+			lease_dereference (&ip_lease, MDL);
 		} else {
 #if defined (DEBUG_FIND_LEASE)
 			log_info ("choosing lease on requested address.");
@@ -4570,7 +4571,6 @@ int find_lease (struct lease **lp,
 			if (lease -> host)
 				host_dereference (&lease -> host, MDL);
 		}
-		lease_dereference (&ip_lease, MDL);
 	}
 
 	/* If we got a lease that matched the client identifier, we may want