diff options
| author | Nick Hibma <n_hibma@FreeBSD.org> | 2017-03-30 18:20:04 +0000 |
|---|---|---|
| committer | Nick Hibma <n_hibma@FreeBSD.org> | 2017-03-30 18:20:04 +0000 |
| commit | 1fb4382cb22e201435107888c19bb7fd1daa13e3 (patch) | |
| tree | 2f9a4da22ac2f06e8d1ea3fcc0fd05837d30ab2b /sbin/dhclient | |
| parent | 9bfb310cf39c686dfa54b4910ee9ccabd200bae4 (diff) | |
Notes
Diffstat (limited to 'sbin/dhclient')
| -rw-r--r-- | sbin/dhclient/dhclient.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 5cf4e4a3d29de..bd7d4330bbfa2 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -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 |