From: Shane Kerr <shane@isc.org>
Date: Fri, 7 Sep 2007 12:20:24 +0000 (+0000)
Subject: Don't remove host and interface addresses from pools in IPv4.
X-Git-Tag: v4_0_0a3~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c61eba3b37c0fba741f40c3999d5e62dbec1a2fe;p=thirdparty%2Fdhcp.git

Don't remove host and interface addresses from pools in IPv4.

See RT ticket #17131 for more.
---

diff --git a/server/dhcpd.c b/server/dhcpd.c
index 336aff902..bd134b290 100644
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -569,9 +569,16 @@ main(int argc, char **argv) {
 	/*
 	 * Remove addresses from our pools that we should not issue
 	 * to clients.
+	 *
+	 * We currently have no support for this in IPv4. It is not 
+	 * as important in IPv4, as making pools with ranges that 
+	 * leave out interfaces and hosts is fairly straightforward
+	 * using range notation, but not so handy with CIDR notation.
 	 */
-	mark_hosts_unavailable();
-	mark_interfaces_unavailable();
+	if (local_family == AF_INET6) {
+		mark_hosts_unavailable();
+		mark_interfaces_unavailable();
+	}
 #endif /* DHCPv6 */