diff options
| author | Roy Marples <roy@marples.name> | 2018-04-19 11:09:09 +0100 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2018-04-19 11:09:09 +0100 |
| commit | b07a075609ced2d7f50145c5dc6bd6a504b90365 (patch) | |
| tree | 5118a99ada87185aa2968285c690f91fd691cb3b | |
| parent | b096f98f531be0a8195c39116abd735d9dba36a7 (diff) | |
| download | dhcpcd-b07a075609ced2d7f50145c5dc6bd6a504b90365.tar.xz | |
DHCP6: Fix sending custom vendor class option.
| -rw-r--r-- | src/dhcp6.c | 2 | ||||
| -rw-r--r-- | src/if-options.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/dhcp6.c b/src/dhcp6.c index 1fd644fc..6e470a98 100644 --- a/src/dhcp6.c +++ b/src/dhcp6.c @@ -287,7 +287,7 @@ dhcp6_makevendor(void *data, const struct interface *ifp) { hvlen = htons((uint16_t)vivco->len); memcpy(p, &hvlen, sizeof(hvlen)); - p += sizeof(len); + p += sizeof(hvlen); memcpy(p, vivco->data, vivco->len); p += vivco->len; } diff --git a/src/if-options.c b/src/if-options.c index d0feaddd..4eb6e6ea 100644 --- a/src/if-options.c +++ b/src/if-options.c @@ -1850,6 +1850,7 @@ err_sla: logerrx("invalid code: %s", arg); return -1; } + fp = strskipwhite(fp); if (fp) { s = parse_string(NULL, 0, fp); if (s == -1) { |