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

    Merges in rt36664

diff --git a/RELNOTES b/RELNOTES
index cbe2612972c2c94505b771f19d3eb9954f15509d..b9c811ab87286869be26dea22f1b6e8ab76fa360 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -67,6 +67,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.2.7rc1
 
 - None

diff --git a/server/confpars.c b/server/confpars.c
index 26cbc3b8b51d3cd66ccaf5c1a2400e0ea572df8a..cc044f8f7680f3619116c561890c8dde0b3b77d9 100644 (file)
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -1068,8 +1068,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 cc33976ef81ae2f951eb862f155b8dd39ce904a2..f0defa176d4cae1d349c311d699811f426824b32 100644 (file)
--- a/server/dhcpd.conf.5
+++ b/server/dhcpd.conf.5
@@ -667,7 +667,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
@@ -679,7 +679,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