diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-01-24 00:54:17 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-01-24 00:54:17 +0000 |
| commit | f6a390cea3cb0c46ff10fddd1216f8ef1e384e56 (patch) | |
| tree | 31390ffe1e8fe9f0f9e747244bf9b994c40416ad | |
| parent | a7a95aa6c00931b73f9df81bb79846a8785df495 (diff) | |
Allow carp(4) interfaces to be configured via dhcp.
Original diff & testing from dtucker@
ok beck@ dtucker@
| -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 51ad92f7c1b..9dae9a1361a 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.657 2020/01/23 22:39:35 krw Exp $ */ +/* $OpenBSD: dhclient.c,v 1.658 2020/01/24 00:54:16 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -232,7 +232,7 @@ get_link_ifa(const char *name, struct ifaddrs *ifap) if (ifa != NULL) { sdl = (struct sockaddr_dl *)ifa->ifa_addr; - if (sdl->sdl_type != IFT_ETHER || + if ((sdl->sdl_type != IFT_ETHER && sdl->sdl_type != IFT_CARP) || sdl->sdl_alen != ETHER_ADDR_LEN) return NULL; } |