Just after dhcpcd started using ND6_PRIV_*_LIFETIME constants(!),

they were moved from a kernel header to src/usr.sbin/rad/rad.h
(ADV_PREFERRED_LIFETIME and ADV_VALID_LIFETIME). Use dhcpcd's own
constants instead. From florian@
This commit is contained in:
sthen 2020-04-03 12:20:17 +00:00
parent 5e9b2a8193
commit 31da65a516
2 changed files with 28 additions and 1 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.68 2020/04/02 16:33:19 sthen Exp $
# $OpenBSD: Makefile,v 1.69 2020/04/03 12:20:17 sthen Exp $
COMMENT= DHCPv4/IPv4LL/IPv6RS/DHCPv6 quad stack client
DISTNAME= dhcpcd-9.0.0
REVISION= 0
CATEGORIES= net
EXTRACT_SUFX= .tar.xz

View File

@ -0,0 +1,26 @@
$OpenBSD: patch-src_if-bsd_c,v 1.10 2020/04/03 12:20:17 sthen Exp $
Just after dhcpcd started using these constants(!), they were moved from a
kernel header to src/usr.sbin/rad/rad.h (ADV_PREFERRED_LIFETIME and
ADV_VALID_LIFETIME). Just use dhcpcd's own definitions instead.
Index: src/if-bsd.c
--- src/if-bsd.c.orig
+++ src/if-bsd.c
@@ -1728,14 +1728,14 @@ int
ip6_temp_preferred_lifetime(__unused const char *ifname)
{
- return ND6_PRIV_PREFERRED_LIFETIME;
+ return TEMP_PREFERRED_LIFETIME;
}
int
ip6_temp_valid_lifetime(__unused const char *ifname)
{
- return ND6_PRIV_VALID_LIFETIME;
+ return TEMP_VALID_LIFETIME;
}
#else /* __OpenBSD__ */