From: Roy Marples <roy@marples.name>
Date: Thu, 19 Apr 2018 10:09:09 +0000 (+0100)
Subject: DHCP6: Fix sending custom vendor class option.
X-Git-Tag: v7.0.4~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c42ca6e4825f47435bc8de53cd142aa1b66ed51b;p=thirdparty%2Fdhcpcd.git

DHCP6: Fix sending custom vendor class option.
---

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) {