From: Shawn Routhier <sar@isc.org>
Date: Mon, 2 Apr 2012 22:51:02 +0000 (+0000)
Subject: Remove outdated note in the bootp keyword about the option not satisfying
X-Git-Tag: v4_2_4b1~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=07123aee28c54497be68e7dea68c37b3cfdd21f9;p=thirdparty%2Fdhcp.git

Remove outdated note in the bootp keyword about the option not satisfying
the requirement of failover peers for denying dynamic bootp clients.
[ISC-bugs #28574]
---

diff --git a/RELNOTES b/RELNOTES
index e3d2541c4..998d6c432 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -99,6 +99,10 @@ work on other platforms. Please report any problems and suggested fixes to
   Bruno Verstuyft and Vincent Demaertelaere of Excentis.
   [ISC-Bugs #27941]
 
+- Remove outdated note in the bootp keyword about the option not satisfying 
+  the requirement of failover peers for denying dynamic bootp clients.
+  [ISC-bugs #28574]
+
 			Changes since 4.2.2
 
 - Fix the code that checks for an existing DDNS transaction to cancel
diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5
index 0373be759..198fc764d 100644
--- a/server/dhcpd.conf.5
+++ b/server/dhcpd.conf.5
@@ -1,6 +1,6 @@
 .\"	dhcpd.conf.5
 .\"
-.\" Copyright (c) 2004-2011 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 2004-2012 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 1996-2003 by Internet Software Consortium
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -27,7 +27,7 @@
 .\" Support and other services are available for ISC products - see
 .\" https://www.isc.org for more information or to learn more about ISC.
 .\"
-.\" $Id: dhcpd.conf.5,v 1.106.18.7 2011/09/21 20:43:10 sar Exp $
+.\" $Id: dhcpd.conf.5,v 1.106.18.8 2012/04/02 22:51:02 sar Exp $
 .\"
 .TH dhcpd.conf 5
 .SH NAME
@@ -1744,11 +1744,6 @@ The \fBbootp\fR flag is used to tell dhcpd whether
 or not to respond to bootp queries.  Bootp queries are \fBallow\fRed
 by default.
 .PP
-This option does not satisfy the requirement of failover peers for denying
-dynamic bootp clients.  The \fBdeny dynamic bootp clients;\fR option should
-be used instead. See the ALLOW AND DENY WITHIN POOL DECLARATIONS section
-of this man page for more details.
-.PP
 .B The
 .I booting
 .B keyword