diff options
| author |   krw <krw@openbsd.org> | 2006-06-01 16:37:54 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2006-06-01 16:37:54 +0000 |
| commit | 2391345b201108d5636f452b4dc442d2f56d5a47 (patch) | |
| tree | ea3a73a463e804b92f886a922b0e6ad9ddb4a311 | |
| parent | Add powerhooks for ral(4) cards with RT2561 chipset, and also fix (diff) | |
| download | wireguard-openbsd-2391345b201108d5636f452b4dc442d2f56d5a47.tar.xz wireguard-openbsd-2391345b201108d5636f452b4dc442d2f56d5a47.zip | |
Don't treat the addition of a dhclient.conf 'alias{}' address as an
external modification when the RTM_NEWADDR message arrives from the
routing socket. Now dhclient will not exit if 'alias{}' is specified
in dhclient.conf.
Mentioned many times, most recently by Matthias Bertschy on misc@.
ok henning@ beck@
| -rw-r--r-- | sbin/dhclient/dhclient.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 715eb0a1ae1..6482582bd47 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.84 2006/05/31 02:21:49 stevesk Exp $ */ +/* $OpenBSD: dhclient.c,v 1.85 2006/06/01 16:37:54 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -200,7 +200,8 @@ routehandler(struct protocol *p) if (addr_eq(a, l->address)) break; - if (l != NULL) /* new addr is the one we set */ + if (l != NULL || addr_eq(a, ifi->client->alias->address)) + /* new addr is the one we set */ break; goto die; |