]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
options: Let clientid override a prior duid
authorRoy Marples <roy@marples.name>
Sat, 1 Aug 2020 19:56:13 +0000 (20:56 +0100)
committerRoy Marples <roy@marples.name>
Sat, 1 Aug 2020 19:56:54 +0000 (20:56 +0100)
So you can do

duid

ssid foo
clientid

src/if-options.c

index 4ba7cf775e9b7b5dde9eda9fd111cf64e522aef5..3373f7df7558e547b80ba34db76341000f2aac18 100644 (file)
@@ -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;