Make dhcp-lease-time option supersedable as well.

Note: It is not recommended to set this value to above the value that
the server provided, unless that value is bogus.
This commit is contained in:
n_hibma 2017-03-30 18:20:04 +00:00
parent e881bc92a3
commit 03ca34f30c

View File

@ -756,7 +756,11 @@ dhcpack(struct packet *packet)
cancel_timeout(send_request, ip);
/* Figure out the lease time. */
if (ip->client->new->options[DHO_DHCP_LEASE_TIME].data)
if (ip->client->config->default_actions[DHO_DHCP_LEASE_TIME] ==
ACTION_SUPERSEDE)
ip->client->new->expiry = getULong(
ip->client->config->defaults[DHO_DHCP_LEASE_TIME].data);
else if (ip->client->new->options[DHO_DHCP_LEASE_TIME].data)
ip->client->new->expiry = getULong(
ip->client->new->options[DHO_DHCP_LEASE_TIME].data);
else