From: Francis Dupont <fdupont@isc.org>
Date: Fri, 15 Feb 2008 18:24:56 +0000 (+0000)
Subject: no hardware parameter in DHCPv6
X-Git-Tag: v4_1_0a2~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e2cfde76bae3e4ed4d8be65a70910b9ce3ac0232;p=thirdparty%2Fdhcp.git

no hardware parameter in DHCPv6
---

diff --git a/RELNOTES b/RELNOTES
index 70b3ad6fc..d83e9ae41 100644
--- 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 b256767a7..eca7b80b1 100644
--- 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) {