From: Roy Marples <roy@marples.name>
Date: Tue, 20 Aug 2019 18:11:01 +0000 (+0100)
Subject: DHCP: Remove check for requiring a clientid when hwlen == 0
X-Git-Tag: v8.0.3~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=033c427ac9c49b7b2b503e343d549d75179ed39c;p=thirdparty%2Fdhcpcd.git

DHCP: Remove check for requiring a clientid when hwlen == 0

We forced DUID anyway for this, so the check is now invalid
and allows (mostly) default config to work.
This does rely on one interface being found with a valid
hardware address to seed the DUID file initally, which
should always be the case.
---

diff --git a/src/dhcp.c b/src/dhcp.c
index 8e48592f..b0c5418a 100644
--- a/src/dhcp.c
+++ b/src/dhcp.c
@@ -3724,12 +3724,6 @@ dhcp_start1(void *arg)
 		return;
 	}
 
-	if (ifp->hwlen == 0 && ifo->clientid[0] == '\0') {
-		logwarnx("%s: needs a clientid to configure", ifp->name);
-		dhcp_drop(ifp, "FAIL");
-		eloop_timeout_delete(ifp->ctx->eloop, NULL, ifp);
-		return;
-	}
 	/* We don't want to read the old lease if we NAK an old test */
 	nolease = state->offer && ifp->ctx->options & DHCPCD_TEST;
 	if (!nolease && ifo->options & DHCPCD_DHCP) {