summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrw <krw@openbsd.org>2017-06-25 00:38:38 +0000
committerkrw <krw@openbsd.org>2017-06-25 00:38:38 +0000
commitf16b31f875b74d297dc2b0127be24c37293dd674 (patch)
treeaa4a29636bb71c6240474b94c45ebbddae997594
parentTweak handling of HUP and new LLADDR. Just use expose and use sighup() (diff)
downloadwireguard-openbsd-f16b31f875b74d297dc2b0127be24c37293dd674.tar.xz
wireguard-openbsd-f16b31f875b74d297dc2b0127be24c37293dd674.zip
Oops. Revert unintentional/premature functional change. Deleting the
address configured by dhclient should cause exit, not restart. There is no need to invoke sendhup(). Just exit and let the privileged child follow.
-rw-r--r--sbin/dhclient/dhclient.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index 8e90b3c5bfb..223fc7f1786 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhclient.c,v 1.447 2017/06/24 23:32:57 krw Exp $ */
+/* $OpenBSD: dhclient.c,v 1.448 2017/06/25 00:38:38 krw Exp $ */
/*
* Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -340,10 +340,9 @@ routehandler(struct interface_info *ifi)
break;
if (adding.s_addr == INADDR_ANY && ifi->active &&
a.s_addr == ifi->active->address.s_addr) {
- /* Tell the priv process active_addr is gone. */
log_warnx("Active address (%s) deleted; exiting",
inet_ntoa(ifi->active->address));
- sendhup();
+ quit = INTERNALSIG;
goto done;
}
if (deleting.s_addr != INADDR_ANY) {