no hardware parameter in DHCPv6

diff --git a/RELNOTES b/RELNOTES
index 70b3ad6fc5704542bf0b6e371c6c1d1bf4f0ffdb..d83e9ae41155ed9f37577f226e690f967e58fcbe 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -159,6 +159,8 @@ work on other platforms. Please report any problems and suggested fixes to
 - DHCPv6 client timestamp in DUID was based on the year 1970 rather 
   than the year 2000.
 
+- Warn when attempting to use a hardware parameter in DHCPv6.
+
                        Changes since 4.0.0b3
 
 - The reverse dns name for PTR updates on IPv6 addresses has been fixed to

diff --git a/server/confpars.c b/server/confpars.c
index b256767a74b5cf1a652ad19351e1722e5d39830a..eca7b80b193ec071911a06fa75a1e9a966e27dc3 100644 (file)
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -532,6 +532,16 @@ int parse_statement (cfile, group, type, host_decl, declaration)
 
              case HARDWARE:
                next_token (&val, (unsigned *)0, cfile);
+#ifdef DHCPv6
+               if (local_family == AF_INET6) {
+                       parse_warn(cfile, "You can not use a hardware "
+                                         "parameter for DHCPv6 hosts. "
+                                         "Use the host-identifier parameter "
+                                         "instead.");
+                       skip_to_semi(cfile);
+                       break;
+               }
+#endif /* DHCPv6 */
                memset (&hardware, 0, sizeof hardware);
                if (host_decl && memcmp(&hardware, &(host_decl->interface),
                                        sizeof(hardware)) != 0) {