- Removed the restriction on using IPv6 address in IPv4 mode. This allow

  IPv4 options which contain IPv6 address to be specified.  For example
  the 6rd option can be specified and use like this:

        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;

diff --git a/RELNOTES b/RELNOTES
index 7c6eb9de8632cc50e891636f9abda987428c16bb..e0f379b30296196e34ce233e6d050de43e367aae 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -41,6 +41,15 @@ work on other platforms. Please report any problems and suggested fixes to
 
                        Changes since 4.2.0
 
+- Removed the restriction on using IPv6 address in IPv4 mode.  This allow
+  IPv4 options which contain IPv6 address to be specified.  For example
+  the 6rd option can be specified and use like this:
+
+       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;
+
+
 - Documentation cleanup covering multiple tickets
   [ISC-Bugs #20265] [ISC-Bugs #20259] minor cleanup
   [ISC-Bugs #20263] add text describing some default values

diff --git a/common/parse.c b/common/parse.c
index 40e95297aca7f111fdd8ea78cf7b9abfafd5923c..865522eeb100427d2f66a3f804e8bf3db25ab7e0 100644 (file)
--- 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.