Skip to content

Options: Preserve v6 vendclass CLI optarg when parsing enterprise number #725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nbromberg-dn wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −4
Open

Options: Preserve v6 vendclass CLI optarg when parsing enterprise number #725

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions src/if-options.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ parse_option(struct dhcpcd_ctx *ctx, const char *ifname, struct if_options *ifo,
int e, i, t;
long l;
unsigned long u;
char *p = NULL, *bp, *fp, *np;
char *p = NULL, *bp, *fp, *np, *dp;
ssize_t s;
struct in_addr addr, addr2;
in_addr_t *naddr;
Expand Down Expand Up @@ -2200,9 +2200,22 @@ parse_option(struct dhcpcd_ctx *ctx, const char *ifname, struct if_options *ifo,
return -1;
#else
fp = strwhite(arg);
if (fp)
*fp++ = '\0';
u = (uint32_t)strtou(arg, NULL, 0, 0, UINT32_MAX, &e);
dp = NULL;
/* Command line options are parsed globally and then replayed
* per-interface using the same argv, so do not split optarg
* in-place. Later passes still need the data after the EN. */
if (fp) {
dl = (size_t)(fp - arg);
dp = malloc(dl + 1);
if (!dp) {
logerr(__func__);
return -1;
}
memcpy(dp, arg, dl);
dp[dl] = '\0';
}
u = (uint32_t)strtou(dp ? dp : arg, NULL, 0, 0, UINT32_MAX, &e);
free(dp);
if (e) {
logerrx("invalid code: %s", arg);
return -1;
Expand Down