Bug in decoding certain options fixed.

See RT ticket #17188 for more.

diff --git a/RELNOTES b/RELNOTES
index 9770b64d351f31b8854c9b5aa3983b726a75d943..9417be7bc238f7305b6d62509eb4ac6c4ee5249c 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -74,6 +74,9 @@ suggested fixes to <dhcp-users@isc.org>.
 
 - Compilation with DLPI and -Werror has been repaired.
 
+- Error in decoding IA_NA option if multiple interfaces are present 
+  fixed by Marcus Goller.
+
                        Changes since 4.0.0a2
 
 - Fix for startup where there are no IPv4 addresses on an interface.

diff --git a/common/options.c b/common/options.c
index eb5f83c17b3f796bb33b75a4ce91cf5989d8055e..28f3ebcb3effe3ef225a5ed1c18aa12edbcef585 100644 (file)
--- a/common/options.c
+++ b/common/options.c
@@ -244,7 +244,7 @@ int parse_option_buffer (options, buffer, length, universe)
 
                                nop->data.buffer = NULL;
                                buffer_reference(&nop->data.buffer, bp, MDL);
-                               nop->data.data = bp->data;
+                               nop->data.data = bp->data + offset;
                                nop->data.len = len;
 
                                option_cache_reference(&op->next, nop, MDL);