From: Thomas Markwalder <tmark@isc.org>
Date: Thu, 28 Jul 2016 11:04:06 +0000 (-0400)
Subject: [v4_1_esv] find_lease() now ACKs reclaimed abandoned addresses
X-Git-Tag: v4_1_esv_r14b1~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9654ad350f53931d99312e03900d9324f89fa83c;p=thirdparty%2Fdhcp.git

[v4_1_esv] find_lease() now ACKs reclaimed abandoned addresses

    Merges in rt41815a.
---

diff --git a/server/dhcp.c b/server/dhcp.c
index 5af25f473..3f50c6a9c 100644
--- a/server/dhcp.c
+++ b/server/dhcp.c
@@ -3844,6 +3844,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.");
@@ -3852,7 +3853,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