- 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 d5bc556e0309dbda2074786ef8197646f2b633de..cc70b8667aa513947553adef60b80da079cac9e6 100644 (file)
--- 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 6fde7584ac227d5b8697a8e2ef9fe34dd4b30c97..1b5aa4fd6ca0cbd4714f4a85c8eafc6c5f22e5d3 100644 (file)
--- 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[] = {