From: Roy Marples <roy@marples.name>
Date: Tue, 21 Oct 2014 18:33:44 +0000 (+0000)
Subject: Fix off by one MAX_CONFLICTS error.
X-Git-Tag: v6.6.0~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bcb1388a64490aa510cf694213ef3053c68dc86a;p=thirdparty%2Fdhcpcd.git

Fix off by one MAX_CONFLICTS error.
---

diff --git a/ipv4ll.c b/ipv4ll.c
index a10f886e..ab4b5c08 100644
--- a/ipv4ll.c
+++ b/ipv4ll.c
@@ -177,7 +177,7 @@ ipv4ll_handle_failure(void *arg)
 	free(state->offer);
 	state->offer = NULL;
 	eloop_timeout_delete(ifp->ctx->eloop, NULL, ifp);
-	if (++state->conflicts > MAX_CONFLICTS) {
+	if (++state->conflicts >= MAX_CONFLICTS) {
 		syslog(LOG_ERR, "%s: failed to acquire an IPv4LL address",
 		    ifp->name);
 		if (ifp->options->options & DHCPCD_DHCP) {