summaryrefslogtreecommitdiff
path: root/sbin/dhclient/dhclient.c
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2013-01-16 05:16:03 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2013-01-16 05:16:03 +0000
commit9ba27442a6cbec5ffe4e3d7b3e3b52f57fb43c8f (patch)
tree6bed1406904022fffff4fa823f1c446e87c5148f /sbin/dhclient/dhclient.c
parent00f344272664ef4487d62d172ac8b7ddbe4a9ce3 (diff)
Don't tell the priviledged process to discard active_addr if there is
a pending address addition. Should fix "routehandler: interface address added" messages and premature exiting of dhclient seen by henniing@ amoung others.
Diffstat (limited to 'sbin/dhclient/dhclient.c')
-rw-r--r--sbin/dhclient/dhclient.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index c3dd5ae6616..f4ee0b9805f 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhclient.c,v 1.206 2013/01/15 21:44:28 krw Exp $ */
+/* $OpenBSD: dhclient.c,v 1.207 2013/01/16 05:16:02 krw Exp $ */
/*
* Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -227,7 +227,7 @@ routehandler(void)
deleting.s_addr = INADDR_ANY;
break;
}
- if (client->active &&
+ if (adding.s_addr == INADDR_ANY && client->active &&
a.s_addr == client->active->address.s_addr) {
/* Tell the priv process active_addr is gone. */
memset(&b, 0, sizeof(b));