summaryrefslogtreecommitdiff
path: root/sbin/dhclient/privsep.c
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2017-06-28 14:35:44 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2017-06-28 14:35:44 +0000
commit0e97a9402cf7485088d43061e7fd7c8540ec8369 (patch)
tree72fdeefa3efc014a92694b2ab90edcd5b3e260c1 /sbin/dhclient/privsep.c
parent4789add3e8ea23d87af356d27e1bf8ebf3103eb1 (diff)
Stop trying to clean up addresses, routes and "-L" file
whenever dhclient dies. Eliminates differences in handling and thus need to intercept signals INT, TERM, USR1, USR2. Eliminates need for 'zapzombies' field and thus entire struct imsg_flushroutes. Eliminates need for 'imsg' parameter to and associated logic in priv_flush_routes(). Address, routes and '-L' file are still cleaned out when binding a lease.
Diffstat (limited to 'sbin/dhclient/privsep.c')
-rw-r--r--sbin/dhclient/privsep.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sbin/dhclient/privsep.c b/sbin/dhclient/privsep.c
index 446570c3f3d..3833ce5e7f7 100644
--- a/sbin/dhclient/privsep.c
+++ b/sbin/dhclient/privsep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: privsep.c,v 1.50 2017/06/24 23:32:57 krw Exp $ */
+/* $OpenBSD: privsep.c,v 1.51 2017/06/28 14:35:43 krw Exp $ */
/*
* Copyright (c) 2004 Henning Brauer <henning@openbsd.org>
@@ -66,11 +66,10 @@ dispatch_imsg(struct interface_info *ifi, struct imsgbuf *ibuf)
break;
case IMSG_FLUSH_ROUTES:
- if (imsg.hdr.len != IMSG_HEADER_SIZE +
- sizeof(struct imsg_flush_routes))
+ if (imsg.hdr.len != IMSG_HEADER_SIZE)
log_warnx("bad IMSG_FLUSH_ROUTES");
else
- priv_flush_routes(ifi, imsg.data);
+ priv_flush_routes(ifi);
break;
case IMSG_ADD_ROUTE: