From: Roy Marples <roy@marples.name>
Date: Mon, 20 Jun 2016 12:34:27 +0000 (+0000)
Subject: Allow the possibility to exclude the vendor class option.
X-Git-Tag: v6.11.2~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2174c47ff7200d5a3bbd2cc7f235eb60899ffa60;p=thirdparty%2Fdhcpcd.git

Allow the possibility to exclude the vendor class option.
---

diff --git a/dhcp6.c b/dhcp6.c
index bbddb574..2064ce8e 100644
--- a/dhcp6.c
+++ b/dhcp6.c
@@ -171,6 +171,9 @@ dhcp6_makevendor(struct dhcp6_option *o, const struct interface *ifp)
 	char vendor[VENDORCLASSID_MAX_LEN];
 
 	ifo = ifp->options;
+	if (has_option_mask(ifo->nomask6, D6_OPTION_VENDOR_CLASS))
+		return 0;
+
 	len = sizeof(uint32_t); /* IANA PEN */
 	if (ifo->vivco_en) {
 		for (i = 0, vivco = ifo->vivco;