From: Ted Lemon <source@isc.org>
Date: Tue, 2 Dec 1997 09:28:08 +0000 (+0000)
Subject: If we're responding to a BOOTP request, hunt for a lease that's applicable - there... 
X-Git-Tag: DHCP-971202~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=355bf452dc475a2cbaafd38bcf3a43db78c122df;p=thirdparty%2Fdhcp.git

If we're responding to a BOOTP request, hunt for a lease that's applicable - there might be more than one lease matching the network and the hardware address.
---

diff --git a/server/dhcp.c b/server/dhcp.c
index 08167e650..7a6a1d1f8 100644
--- a/server/dhcp.c
+++ b/server/dhcp.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: dhcp.c,v 1.55 1997/12/02 09:07:03 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: dhcp.c,v 1.56 1997/12/02 09:28:08 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -1190,11 +1190,17 @@ struct lease *find_lease (packet, share, ours)
 					  packet -> raw -> hlen);
 	/* Find the lease that's on the network the packet came from
 	   (if any). */
-	for (; hw_lease; hw_lease = hw_lease -> n_hw)
-		if (hw_lease -> shared_network == share)
-			break;
-	if (hw_lease && (hw_lease -> flags & ABANDONED_LEASE))
-		hw_lease = (struct lease *)0;
+	for (; hw_lease; hw_lease = hw_lease -> n_hw) {
+		if (hw_lease -> shared_network == share) {
+			if (hw_lease -> flags & ABANDONED_LEASE)
+				continue;
+			if (packet -> packet_type)
+				break;
+			if (hw_lease -> flags &
+			    (BOOTP_LEASE | DYNAMIC_BOOTP_OK))
+				break;
+		}
+	}
 
 	/* Try to find a lease that's been allocated to the client's
 	   IP address. */