[master] Restores ability of server to return dhcp6.vendor-opts to client

    Merges in rt46427.

diff --git a/RELNOTES b/RELNOTES
index 4067c253c9e297c0888ac5f576f4b270075c59f0..5c5835dde4c24847bf4ba075438cbbaa6540f1e7 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -251,6 +251,11 @@ dhcp-users@lists.isc.org.
   reporting the issue.
   [ISC-Bugs #44576]
 
+- The ability of the server to send back dhcp6.vendor-opts values has been
+  restored. A change in 4.3.5 (see #29246) which enabled it to send back the
+  FQDN option unfortunately broke its ability send back dhcp6.vendor-opts.
+  [ISC-Bugs #46427]
+
                        Changes since 4.3.0 (bug fixes)
 
 - Tidy up several small tickets.

diff --git a/common/options.c b/common/options.c
index ae5b2844d27bdeb6bd477b44b2c872a4a2dc560c..5044d4a1e9f003eb622d98a3bcc1a1eb6b9aee44 100644 (file)
--- a/common/options.c
+++ b/common/options.c
@@ -1126,11 +1126,13 @@ store_options6(char *buf, int buflen,
                }
 
                /*
-                * See if this is the VSIO option.
+                * If this is the VSIO option flag it so we'll know to
+                * check the vsio space later on.  However we still need
+                * to check for the existence of any defined via
+                * dhcp6.vendor-opts. Those are stored as simple values.
                 */
                if (code == vsio_option_code) {
                        vsio_wanted = 1;
-                       continue;
                }
 
                /*