From: Roy Marples <roy@marples.name>
Date: Wed, 1 Jul 2020 19:09:42 +0000 (+0100)
Subject: DHCP6: Restore lease timings
X-Git-Tag: v9.1.3~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50b57407f9089c13101ddabc26359d9f46e76e59;p=thirdparty%2Fdhcpcd.git

DHCP6: Restore lease timings

Erroneously changed in 060f5a9e93, only seems to affect
INFORM getting into a loop.
---

diff --git a/src/dhcp6.c b/src/dhcp6.c
index da472b9d..2cf40793 100644
--- a/src/dhcp6.c
+++ b/src/dhcp6.c
@@ -3183,14 +3183,12 @@ dhcp6_bind(struct interface *ifp, const char *op, const char *sfrom)
 			state->state = DH6S_BOUND;
 		state->failed = false;
 
-		if ((state->renew != 0 || state->rebind != 0) &&
-		    state->renew != ND6_INFINITE_LIFETIME)
+		if (state->renew && state->renew != ND6_INFINITE_LIFETIME)
 			eloop_timeout_add_sec(ifp->ctx->eloop,
 			    state->renew,
 			    state->state == DH6S_INFORMED ?
 			    dhcp6_startinform : dhcp6_startrenew, ifp);
-		if ((state->rebind != 0 || state->expire != 0) &&
-		    state->rebind != ND6_INFINITE_LIFETIME)
+		if (state->rebind && state->rebind != ND6_INFINITE_LIFETIME)
 			eloop_timeout_add_sec(ifp->ctx->eloop,
 			    state->rebind, dhcp6_startrebind, ifp);
 		if (state->expire != ND6_INFINITE_LIFETIME)