summaryrefslogtreecommitdiff
path: root/sbin/dhclient/dhclient.c
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2014-11-03 02:22:16 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2014-11-03 02:22:16 +0000
commita7ef034be229b99dee62d52b449fba299be46bb9 (patch)
tree20181309d72fe46f7ebc510af2db1016c5fef0f1 /sbin/dhclient/dhclient.c
parentc45ce5392492438ca76b240a92b8011808a23bfe (diff)
No need to immediately remove an expired lease from the list of
leases. It will be ignored, so let the normal cleanup in bind_lease() take care of it.
Diffstat (limited to 'sbin/dhclient/dhclient.c')
-rw-r--r--sbin/dhclient/dhclient.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index 01bc48b63ca..a93d1a4af57 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhclient.c,v 1.326 2014/11/02 15:18:32 krw Exp $ */
+/* $OpenBSD: dhclient.c,v 1.327 2014/11/03 02:22:15 krw Exp $ */
/*
* Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -639,10 +639,8 @@ state_reboot(void)
adding.s_addr = INADDR_ANY;
time(&cur_time);
- if (client->active && client->active->expiry <= cur_time) {
- free_client_lease(client->active);
+ if (client->active && client->active->expiry <= cur_time)
client->active = NULL;
- }
/* Run through the list of leases and see if one can be used. */
TAILQ_FOREACH(lp, &client->leases, next) {