From: Roy Marples <roy@marples.name>
Date: Fri, 21 Apr 2017 23:00:51 +0000 (+0100)
Subject: Newer OpenBSD is fixed for userland affecting address lifetime.
X-Git-Tag: v7.0.0-rc1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5f177ec84432ce345e9367b863e7394fa9ece3c;p=thirdparty%2Fdhcpcd.git

Newer OpenBSD is fixed for userland affecting address lifetime.
Thanks to Stuart Henderson.
---

diff --git a/src/if-bsd.c b/src/if-bsd.c
index addca622..40152cae 100644
--- a/src/if-bsd.c
+++ b/src/if-bsd.c
@@ -787,7 +787,7 @@ if_address6(unsigned char cmd, const struct ipv6_addr *ia)
 	 */
 
 #if !((defined(__NetBSD_Version__) && __NetBSD_Version__ >= 799003600) || \
-      (defined(__OpenBSD__)))
+      (defined(__OpenBSD__) && OpenBSD >= 201605))
 	if (cmd == RTM_NEWADDR && !(ia->flags & IPV6_AF_ADDED)) {
 		ifa.ifra_lifetime.ia6t_vltime = ND6_INFINITE_LIFETIME;
 		ifa.ifra_lifetime.ia6t_pltime = ND6_INFINITE_LIFETIME;
@@ -795,8 +795,8 @@ if_address6(unsigned char cmd, const struct ipv6_addr *ia)
 	}
 #endif
 
-#if defined(__OpenBSD__)
-	/* BUT OpenBSD does not reset the address lifetime
+#if defined(__OpenBSD__) && OpenBSD <= 201705
+	/* BUT OpenBSD older than 6.2 does not reset the address lifetime
 	 * for subsequent calls...
 	 * Luckily dhcpcd will remove the lease when it expires so
 	 * just set an infinite lifetime, unless a temporary address. */