summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2012-10-10 17:44:44 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2012-10-10 17:44:44 +0000
commitd2285c9537aa64983166aca5ea934f9b033e9932 (patch)
tree5820f76caa35084ce5c8be3ed496232e023c7290 /sbin
parentf14730d7214076ab060ed9afb3d70a055d37deb4 (diff)
Revert r1.155. Routing breaks if dhclient-script flushes the
interface's routes when the interface is down. Prevents floods of RTM_MISS messages on 'ifconfig down'. And might fix the vpn related failures pirofti@ is seeing.
Diffstat (limited to 'sbin')
-rw-r--r--sbin/dhclient/dhclient.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index 95fb1144080..c1c37ebfd20 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhclient.c,v 1.156 2012/09/18 09:34:09 krw Exp $ */
+/* $OpenBSD: dhclient.c,v 1.157 2012/10/10 17:44:43 krw Exp $ */
/*
* Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -243,10 +243,6 @@ routehandler(void)
if (ifi->linkstat) {
client->state = S_REBOOTING;
state_reboot();
- } else if (client->active) {
- script_init("FAIL");
- script_write_params("old_", client->active);
- script_go();
}
}
break;
@@ -265,9 +261,7 @@ routehandler(void)
die:
script_init("FAIL");
- script_write_params("old_", client->active);
script_go();
- sleep(2);
error("routehandler: %s", errmsg);
}