From: Shawn Routhier <sar@isc.org>
Date: Fri, 18 Feb 2011 18:02:25 +0000 (+0000)
Subject: Removed the restriction on using IPv6 addresses in IPv4 mode.  This
X-Git-Tag: v4_2_1rc1~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a8a63f3553990069be32f18b849543bf19cc813f;p=thirdparty%2Fdhcp.git

Removed the restriction on using IPv6 addresses in IPv4 mode.  This
allows IPv4 options which contain IPv6 addresses to be specified.
[ISC-Bugs #23039]
---

diff --git a/RELNOTES b/RELNOTES
index aeb305b9a..196829ac7 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -39,6 +39,17 @@ The system has only been tested on Linux, FreeBSD, and Solaris, and may not
 work on other platforms. Please report any problems and suggested fixes to
 <dhcp-users@isc.org>.
 
+			Changes since 4.2.1b1
+
+- Removed the restriction on using IPv6 addresses in IPv4 mode.  This
+  allows IPv4 options which contain IPv6 addresses to be specified.  For
+  example the 6rd option can be specified and used like this:
+  [ISC-Bugs #23039]
+
+	option 6rd code 212 = { integer 8, integer 8,
+				ip6-address, array of ip-address };
+	option 6rd 16 10 2001:: 1.2.3.4, 5.6.7.8;
+
 			Changes since 4.2.0
 
 - 'get-host-names true;' now also works even if 'use-host-decl-names true;'
diff --git a/common/parse.c b/common/parse.c
index 40e95297a..865522eeb 100644
--- a/common/parse.c
+++ b/common/parse.c
@@ -373,13 +373,6 @@ parse_ip6_addr(struct parse *cfile, struct iaddr *addr) {
 	char v6[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255")];
 	int v6_len;
 
-        if (local_family != AF_INET6) {
-                parse_warn(cfile, "IPv6 addresses are only available "
-				  "in DHCPv6 mode.");
-                skip_to_semi(cfile);
-                return 0;
-        }
-
 	/*
 	 * First token is non-raw. This way we eat any whitespace before 
 	 * our IPv6 address begins, like one would expect.