X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv4.c;h=81e537d3ddbb8f4b7bc6e770e213c228ced1819f;hp=5ef99b13f317fedd6196455f81f54b0ed5461445;hb=4e579c4b7dbdcce624a8f031ba2a192fdde691a6;hpb=da660c752d1c177934a01e28c68368879523b74d

diff --git a/src/dhcpv4.c b/src/dhcpv4.c
index 5ef99b1..81e537d 100644
--- a/src/dhcpv4.c
+++ b/src/dhcpv4.c
@@ -153,8 +153,7 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable)
 				return -1;
 			}
 
-			if (lease->dhcpv4_leasetime >= 60)
-				a->leasetime = lease->dhcpv4_leasetime;
+			a->leasetime = lease->dhcpv4_leasetime;
 
 			a->addr = ntohl(lease->ipaddr.s_addr);
 			memcpy(a->hwaddr, lease->mac.ether_addr_octet, sizeof(a->hwaddr));
@@ -194,10 +193,6 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable)
 				free_dhcpv4_assignment(a);
 		}
 
-
-		if (iface->dhcpv4_leasetime < 60)
-			iface->dhcpv4_leasetime = 43200;
-
 		iface->dhcpv4_event.uloop.fd = sock;
 		iface->dhcpv4_event.handle_dgram = handle_dhcpv4;
 		odhcpd_register(&iface->dhcpv4_event);
@@ -627,7 +622,7 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
 			assigned = dhcpv4_assign(iface, a, raddr);
 		}
 
-		if (a->leasetime >= 60)
+		if (a->leasetime)
 			my_leasetime = a->leasetime;
 		else
 			my_leasetime = iface->dhcpv4_leasetime;