[v4_1_esv] find_lease() now ACKs reclaimed abandoned addresses

    Merges in rt41815a.

diff --git a/server/dhcp.c b/server/dhcp.c
index 5af25f473a8cf10b0ec9a7bbe9457255b9d0fa0e..3f50c6a9c4ef01f5f845921fcd1ebecb0fc98c61 100644 (file)
--- 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