From: Shane Kerr <shane@isc.org>
Date: Thu, 4 Oct 2007 12:14:42 +0000 (+0000)
Subject: Bug in decoding certain options fixed.
X-Git-Tag: v4_0_0b1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ad9d48f8c27df784c1116b9df61ccb0baf84e81;p=thirdparty%2Fdhcp.git

Bug in decoding certain options fixed.

See RT ticket #17188 for more.
---

diff --git a/RELNOTES b/RELNOTES
index 9770b64d3..9417be7bc 100644
--- 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 eb5f83c17..28f3ebcb3 100644
--- 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);