From: David Hankins <dhankins@isc.org>
Date: Mon, 24 Mar 2008 17:55:45 +0000 (+0000)
Subject: - DHCPv6 vendor-class options (VSIO) are now only sent when they appear
X-Git-Tag: v4_1_0a2~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ac4206a6374fd6cf9599d0d382a9753a8ebd1d2;p=thirdparty%2Fdhcp.git

- DHCPv6 vendor-class options (VSIO) are now only sent when they appear
  on the DHCPv6 ORO.  This resolves a bug where VSIO options were placed
  in IA_NA encapsulated options fields.  [ISC-Bugs #17852]
---

diff --git a/RELNOTES b/RELNOTES
index d5bc556e0..cc70b8667 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -77,6 +77,10 @@ work on other platforms. Please report any problems and suggested fixes to
 
 - A memory leak when using omapi has been fixed.
 
+- DHCPv6 vendor-class options (VSIO) are now only sent when they appear
+  on the DHCPv6 ORO.  This resolves a bug where VSIO options were placed
+  in IA_NA encapsulated options fields.
+
 			Changes since 4.0.0 (new features)
 
 - Added DHCPv6 rapid commit support.
diff --git a/server/dhcpv6.c b/server/dhcpv6.c
index 6fde7584a..1b5aa4fd6 100644
--- a/server/dhcpv6.c
+++ b/server/dhcpv6.c
@@ -684,7 +684,6 @@ static const int required_opts_solicit[] = {
 	D6O_IA_PD,
 	D6O_RAPID_COMMIT,
 	D6O_STATUS_CODE,
-	D6O_VENDOR_OPTS,
 	D6O_RECONF_ACCEPT,
 	D6O_PREFERENCE,
 	0
@@ -697,13 +696,11 @@ static const int required_opts_agent[] = {
 static const int required_opts_IA[] = {
 	D6O_IAADDR,
 	D6O_STATUS_CODE,
-	D6O_VENDOR_OPTS,
 	0
 };
 static const int required_opts_IA_PD[] = {
 	D6O_IAPREFIX,
 	D6O_STATUS_CODE,
-	D6O_VENDOR_OPTS,
 	0
 };
 static const int required_opts_STATUS_CODE[] = {