- The parse warning that 'deny dyanmic bootp;' must be configured for

  failover protected subnets was removed. [ISC-Bugs #16975]

2 files changed, 7 insertions, 55 deletions

diff --git a/RELNOTES b/RELNOTES
index 864c346e..301b3430 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -25,6 +25,12 @@ For information on how to install, configure and run this software,
 as well as how to find documentation and report bugs, please consult
 the README file.
 
+
+			Changes since 3.1.0rc1
+
+- The parse warning that 'deny dyanmic bootp;' must be configured for
+  failover protected subnets was removed.
+
 			Changes since 3.1.0b2
 
 - Silenced compiler warnings on NetBSD
diff --git a/server/confpars.c b/server/confpars.c
index 0330fc06..8cb03b2a 100644
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: confpars.c,v 1.159.16.4 2007/05/03 21:23:03 each Exp $ Copyright (c) 2004-2007 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: confpars.c,v 1.159.16.5 2007/06/28 17:20:40 dhankins Exp $ Copyright (c) 2004-2007 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -1512,60 +1512,6 @@ void parse_pool_statement (cfile, group, type)
 		}
 	} while (!done);
 
-#if defined (FAILOVER_PROTOCOL)
-	/* We can't do failover on a pool that supports dynamic bootp,
-	   because BOOTP doesn't support leases, and failover absolutely
-	   depends on lease timing. */
-	if (pool -> failover_peer) {
-		/* This search order matches the search orders later in
-		 * execution - deny first, if not denied, check permit
-		 * list.  A dynamic bootp client may be known or unknown,
-		 * it may belong to a member of a class, but it definitely
-		 * will not be authenticated since that requires DHCP
-		 * to work.  So a dynamic bootp client is definitely not
-		 * an authenticated client, and we can't say for sure about
-		 * anything else.
-		 *
-		 * So we nag the user.
-		 */
-		for (permit = pool -> prohibit_list; permit;
-		     permit = permit -> next) {
-			if (permit -> type == permit_dynamic_bootp_clients ||
-			    permit -> type == permit_unauthenticated_clients ||
-			    permit -> type == permit_all_clients)
-				break;
-		}
-		if (!permit) {
-			permit = pool -> permit_list;
-			do {
-				if (!permit ||
-				    permit -> type !=
-					permit_authenticated_clients) {
-					parse_warn (cfile,
-					  "pools with failover peers %s",
-					  "may not permit dynamic bootp.");
-					log_error ("Either write a \"%s\" %s",
-					  "no failover",
-					  "statement and use disjoint");
-					log_error ("pools, or%s (%s) %s",
-					  " don't permit dynamic bootp",
-					  "\"deny dynamic bootp clients;\"",
-					  "in this pool.");
-					log_error ("This is a protocol,%s %s",
-					   " limitation, not an ISC DHCP",
-					   "limitation, so");
-					log_error ("please don't request an %s",
-					   "enhancement or ask why this is.");
-
-					break;
-				}
-
-				permit = permit -> next;
-			} while (permit);
-		}
-	}
-#endif /* FAILOVER_PROTOCOL */
-
 	/* See if there's already a pool into which we can merge this one. */
 	for (pp = pool -> shared_network -> pools; pp; pp = pp -> next) {
 		struct lease *l;