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 336aff902eb0fa7c9a5bc4f1ac05f28eef04876b..bd134b29089c4256224fe1e99ab5d661982b6cf2 100644 (file)
--- 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 */