DHCP6: Fix sending custom vendor class option.

diff --git a/src/dhcp6.c b/src/dhcp6.c
index 1fd644fcfa7b2a8808024a591e30be3df59e065a..6e470a988551e973d05e2f2a6fa99681f07d486a 100644 (file)
--- 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 d0feadddfd969d735e66465e79675cf3e08aa5e4..4eb6e6eaecaa98487c5892d31637b8626a7a63f5 100644 (file)
--- 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) {