summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--RELNOTES5
-rw-r--r--common/options.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/RELNOTES b/RELNOTES
index 4067c253..5c5835dd 100644
--- 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 ae5b2844..5044d4a1 100644
--- 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;
}
/*