From: Steven Barth <steven@midlink.org>
Date: Sat, 23 Aug 2014 12:32:00 +0000 (+0200)
Subject: odhcpd: don't kill static lease entries
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=commitdiff_plain;h=24452e1e3e9adfd9d8e183db1aa589f77727f5a7

odhcpd: don't kill static lease entries
---

diff --git a/src/dhcpv4.c b/src/dhcpv4.c
index 89750b2..fdf5f68 100644
--- a/src/dhcpv4.c
+++ b/src/dhcpv4.c
@@ -611,10 +611,9 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
 		if (assigned && a)
 			lease = a;
 	} else if (msg == DHCPV4_MSG_RELEASE) {
-		if (a) {
+		if (a && a->valid_until != LONG_MAX)
 			a->valid_until = 0;
-		}
-	} else if (msg == DHCPV4_MSG_DECLINE) {
+	} else if (msg == DHCPV4_MSG_DECLINE && a->valid_until != LONG_MAX) {
 		memset(a->hwaddr, 0, sizeof(a->hwaddr));
 		a->valid_until = now + 3600; // Block address for 1h
 	}