From: Roy Marples <roy@marples.name>
Date: Thu, 12 Dec 2019 14:06:20 +0000 (+0000)
Subject: DHCP: Don't warn about expiry of deprecated addresses
X-Git-Tag: v8.1.3~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aaf4ec3798a56ba12dc69f84a2bcef0eb9aed820;p=thirdparty%2Fdhcpcd.git

DHCP: Don't warn about expiry of deprecated addresses
---

diff --git a/src/dhcp6.c b/src/dhcp6.c
index cd67b9bb..6bda4845 100644
--- a/src/dhcp6.c
+++ b/src/dhcp6.c
@@ -2988,8 +2988,9 @@ dhcp6_bind(struct interface *ifp, const char *op, const char *sfrom)
 			TAILQ_FOREACH(ia, &state->addrs, next) {
 				if (ia->flags & IPV6_AF_STALE)
 					continue;
-				if (!(state->renew == ND6_INFINITE_LIFETIME &&
-				    ia->prefix_vltime == ND6_INFINITE_LIFETIME)
+				if (!(state->renew == ND6_INFINITE_LIFETIME
+				    && ia->prefix_vltime == ND6_INFINITE_LIFETIME)
+				    && ia->prefix_vltime != 0
 				    && ia->prefix_vltime <= state->renew)
 					logwarnx(
 					    "%s: %s will expire before renewal",