diff options
| author |   krw <krw@openbsd.org> | 2013-01-16 05:16:02 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2013-01-16 05:16:02 +0000 |
| commit | 3def312307befedd9540e2665cdf20852832b9c3 (patch) | |
| tree | db4347886b834e1ab8f1fc85ac062d0d16657c07 | |
| parent | Sort the PCI ids. (diff) | |
| download | wireguard-openbsd-3def312307befedd9540e2665cdf20852832b9c3.tar.xz wireguard-openbsd-3def312307befedd9540e2665cdf20852832b9c3.zip | |
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.
| -rw-r--r-- | sbin/dhclient/dhclient.c | 4 |
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)); |