From: Roy Marples <roy@marples.name>
Date: Sat, 1 Aug 2020 19:56:13 +0000 (+0100)
Subject: options: Let clientid override a prior duid
X-Git-Tag: v9.2.0~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59430d295e41b4533a5e695cf3d3f27877a2aaf2;p=thirdparty%2Fdhcpcd.git

options: Let clientid override a prior duid

So you can do

duid

ssid foo
clientid
---

diff --git a/src/if-options.c b/src/if-options.c
index 4ba7cf77..3373f7df 100644
--- a/src/if-options.c
+++ b/src/if-options.c
@@ -1023,6 +1023,7 @@ parse_option(struct dhcpcd_ctx *ctx, const char *ifname, struct if_options *ifo,
 		}
 		ifo->options |= DHCPCD_CLIENTID;
 		ifo->clientid[0] = (uint8_t)s;
+		ifo->options &= ~DHCPCD_DUID;
 		break;
 	case 'J':
 		ifo->options |= DHCPCD_BROADCAST;