From 9ba27442a6cbec5ffe4e3d7b3e3b52f57fb43c8f Mon Sep 17 00:00:00 2001 From: Kenneth R Westerback Date: Wed, 16 Jan 2013 05:16:03 +0000 Subject: 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. --- sbin/dhclient/dhclient.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sbin/dhclient/dhclient.c') 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 @@ -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)); -- cgit v1.2.3