From: Thomas Markwalder <tmark@isc.org>
Date: Tue, 9 Sep 2014 11:32:37 +0000 (-0400)
Subject: [master] Server now supports a failover split value of 256.
X-Git-Tag: v4_3_2.pre-beta~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a537542d6ab3d795fb9bab9b2990625d543ce41;p=thirdparty%2Fdhcp.git

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

    Merges in rt36664
---

diff --git a/RELNOTES b/RELNOTES
index 626a7be61..64d8cecec 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -80,6 +80,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.3.1b1
 
 - Modify the linux and openwrt dhclient scripts to process information
diff --git a/server/confpars.c b/server/confpars.c
index a10c98eb0..1f7cf73dd 100644
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -1082,8 +1082,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 3a7739e8d..bdf382361 100644
--- a/server/dhcpd.conf.5
+++ b/server/dhcpd.conf.5
@@ -675,7 +675,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
@@ -687,7 +687,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