[v4_1_esv] Server now supports a failover split value of 256.

    Merges in rt36664

diff --git a/RELNOTES b/RELNOTES
index 858ba8a701b9efaf4c59f378481da472e028d1ab..e344e0ea565c3e8bf75574230785752a9af0199e 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -76,6 +76,9 @@ by Eric Young (eay@cryptsoft.com).
   [ISC-Bugs #36712] Corrects Coverity reported "high" impact issues
   [ISC-Bugs #36933] Corrects Coverity reported "medium" impact issues
 
+- Server now supports a failover split value of 256.
+  [ISC-Bugs] #36664]
+
                        Changes since 4.1-ESV-R10rc1
 
 - None

diff --git a/server/confpars.c b/server/confpars.c
index e97cdcee873456c37d486bf6cf1fd4d124f1f7a5..ec912d803c435d476cd91d07ec9d6eae8dc19f74 100644 (file)
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -1085,8 +1085,9 @@ void parse_failover_peer (cfile, group, type)
                                return;
                        }
                        split = atoi (val);
-                       if (split > 255) {
-                               parse_warn (cfile, "split must be < 256");
+                       if (split > 256) {
+                               parse_warn (cfile, "split must be between "
+                                                   "0 and 256, inclusive");
                        } else {
                                memset (hba, 0, sizeof hba);
                                for (i = 0; i < split; i++) {

diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5
index 1904a074b13627d5e989d5c222a03770a8ee566e..82dad4fcfa0f2822f87e3ea3d71f50c4f9020b67 100644 (file)
--- a/server/dhcpd.conf.5
+++ b/server/dhcpd.conf.5
@@ -669,7 +669,7 @@ The
 statement
 .RS 0.25i
 .PP
-.B split \fIindex\fR\fB;\fR
+.B split \fIbits\fR\fB;\fR
 .PP
 The split statement specifies the split between the primary and
 secondary for the purposes of load balancing.  Whenever a client
@@ -681,7 +681,9 @@ the secondary is responsible.  The \fBsplit\fR value determines
 how many of the leading bits are set to one.  So, in practice, higher
 split values will cause the primary to serve more clients than the
 secondary.  Lower split values, the converse.  Legal values are between
-0 and 255, of which the most reasonable is 128.
+0 and 256 inclusive, of which the most reasonable is 128.  Note that
+a value of 0 makes the secondary responsible for all clients and a value
+of 256 makes the primary responsible for all clients.
 .RE
 .PP
 The