7a016a
diff -up dhcp-4.3.5b1/client/dhclient.conf.5.man dhcp-4.3.5b1/client/dhclient.conf.5
7a016a
--- dhcp-4.3.5b1/client/dhclient.conf.5.man	2016-08-26 20:19:53.000000000 +0200
7a016a
+++ dhcp-4.3.5b1/client/dhclient.conf.5	2016-09-12 17:09:23.243313514 +0200
7a016a
@@ -228,7 +228,8 @@ responding to the client send the client
7a016a
 options.  Only the option names should be specified in the request
7a016a
 statement - not option parameters.  By default, the DHCPv4 client
7a016a
 requests the subnet-mask, broadcast-address, time-offset, routers,
7a016a
-domain-name, domain-name-servers and host-name options while the DHCPv6
7a016a
+domain-search, domain-name, domain-name-servers, host-name, nis-domain,
7a016a
+nis-servers, ntp-servers and interface-mtu options while the DHCPv6
7a016a
 client requests the dhcp6 name-servers and domain-search options.  Note
7a016a
 that if you enter a \'request\' statement, you over-ride these defaults
7a016a
 and these options will not be requested.
7a016a
@@ -736,6 +737,17 @@ know the DHCP service(s) anycast MAC add
7a016a
 client.  The \fIlink-type\fR and \fImac-address\fR parameters are configured
7a016a
 in a similar manner to the \fBhardware\fR statement.
7a016a
 .PP
7a016a
+ \fBbootp-broadcast-always;\fR
7a016a
+.PP
7a016a
+The
7a016a
+.B bootp-broadcast-always
7a016a
+statement instructs dhclient to always set the bootp broadcast flag in
7a016a
+request packets, so that servers will always broadcast replies.
7a016a
+This is equivalent to supplying the dhclient -B argument, and has
7a016a
+the same effect as specifying 'always-broadcast' in the server's dhcpd.conf.
7a016a
+This option is provided as an extension to enable dhclient to work
7a016a
+on IBM s390 Linux guests.
7a016a
+.PP
7a016a
 .SH SAMPLE
7a016a
 The following configuration file was used on a laptop running NetBSD
7a016a
 1.3, though the domains have been modified.
7a016a
diff -up dhcp-4.3.5b1/client/dhclient-script.8.man dhcp-4.3.5b1/client/dhclient-script.8
7a016a
--- dhcp-4.3.5b1/client/dhclient-script.8.man	2016-08-26 20:19:53.000000000 +0200
7a016a
+++ dhcp-4.3.5b1/client/dhclient-script.8	2016-09-12 17:08:09.516254385 +0200
7a016a
@@ -45,7 +45,7 @@ customizations are needed, they should b
e83fb1
 exit hooks provided (see HOOKS for details).   These hooks will allow the
e83fb1
 user to override the default behaviour of the client in creating a
e83fb1
 .B /etc/resolv.conf
e83fb1
-file.
e83fb1
+file, and to handle DHCP options not handled by default.
e83fb1
 .PP
e83fb1
 No standard client script exists for some operating systems, even though
e83fb1
 the actual client may work, so a pioneering user may well need to create
7a016a
@@ -89,6 +89,26 @@ present.   The
e83fb1
 .B ETCDIR/dhclient-exit-hooks
e83fb1
 script can modify the valid of exit_status to change the exit status
e83fb1
 of dhclient-script.
e83fb1
+.PP
e83fb1
+Immediately after dhclient brings an interface UP with a new IP address,
e83fb1
+subnet mask, and routes, in the REBOOT/BOUND states, it will check for the
e83fb1
+existence of an executable
e83fb1
+.B ETCDIR/dhclient-up-hooks
e83fb1
+script, and source it if found. This script can handle DHCP options in
e83fb1
+the environment that are not handled by default. A per-interface.
e83fb1
+.B ETCDIR/dhclient-${IF}-up-hooks
e83fb1
+script will override the generic script and be sourced when interface
e83fb1
+$IF has been brought up.
e83fb1
+.PP
e83fb1
+Immediately before dhclient brings an interface DOWN, removing its IP
e83fb1
+address, subnet mask, and routes, in the STOP/RELEASE  states, it will
e83fb1
+check for the existence of an executable
e83fb1
+.B ETCDIR/dhclient-down-hooks
e83fb1
+script, and source it if found. This script can handle DHCP options in
e83fb1
+the environment that are not handled by default. A per-interface
e83fb1
+.B ETCDIR/dhclient-${IF}-down-hooks
e83fb1
+script will override the generic script and be sourced when interface
e83fb1
+$IF is about to be brought down.
e83fb1
 .SH OPERATION
e83fb1
 When dhclient needs to invoke the client configuration script, it
e83fb1
 defines a set of variables in the environment, and then invokes
7a016a
diff -up dhcp-4.3.5b1/common/dhcp-options.5.man dhcp-4.3.5b1/common/dhcp-options.5
7a016a
--- dhcp-4.3.5b1/common/dhcp-options.5.man	2016-08-26 20:19:53.000000000 +0200
7a016a
+++ dhcp-4.3.5b1/common/dhcp-options.5	2016-09-12 17:08:09.517254386 +0200
7a016a
@@ -1013,6 +1013,21 @@ classless IP routing - it does not inclu
45c037
 classless IP routing is now the most widely deployed routing standard,
45c037
 this option is virtually useless, and is not implemented by any of the
45c037
 popular DHCP clients, for example the Microsoft DHCP client.
45c037
+.PP
45c037
+NOTE to Fedora dhclient users:
45c037
+.br
45c037
+dhclient-script interprets trailing 0 octets of the target as indicating
45c037
+the subnet class of the route, so for the following static-routes value:
45c037
+.br
45c037
+        option static-routes 172.0.0.0 172.16.2.254,
45c037
+.br
45c037
+                             192.168.0.0 192.168.2.254;
45c037
+.br
45c037
+dhclient-script will create routes:
45c037
+.br
45c037
+        172/8 via 172.16.2.254 dev $interface
45c037
+.br
45c037
+        192.168/16 via 192.168.2.254 dev $interface
45c037
 .RE
45c037
 .PP
45c037
 .nf
7a016a
diff -up dhcp-4.3.5b1/server/dhcpd.conf.5.man dhcp-4.3.5b1/server/dhcpd.conf.5
7a016a
--- dhcp-4.3.5b1/server/dhcpd.conf.5.man	2016-08-26 20:19:53.000000000 +0200
7a016a
+++ dhcp-4.3.5b1/server/dhcpd.conf.5	2016-09-12 17:10:11.205351980 +0200
7a016a
@@ -528,6 +528,9 @@ pool {
45c037
 };
45c037
 .fi
45c037
 .PP
45c037
+Dynamic BOOTP leases are not compatible with failover, and, as such,
45c037
+you need to disallow BOOTP in pools that you are using failover for.
45c037
+.PP
45c037
 The  server currently  does very  little  sanity checking,  so if  you
45c037
 configure it wrong, it will just  fail in odd ways.  I would recommend
45c037
 therefore that you either do  failover or don't do failover, but don't
7a016a
@@ -542,9 +545,9 @@ primary server might look like this:
45c037
 failover peer "foo" {
45c037
   primary;
7a016a
   address anthrax.rc.example.com;
45c037
-  port 519;
45c037
+  port 647;
7a016a
   peer address trantor.rc.example.com;
45c037
-  peer port 520;
45c037
+  peer port 847;
45c037
   max-response-delay 60;
45c037
   max-unacked-updates 10;
45c037
   mclt 3600;
7a016a
@@ -1246,7 +1249,7 @@ the zone containing PTR records - for IS
45c037
 .PP
45c037
 .nf
45c037
 key DHCP_UPDATER {
45c037
-  algorithm HMAC-MD5.SIG-ALG.REG.INT;
45c037
+  algorithm hmac-md5;
45c037
   secret pRP5FapFoJ95JEL06sv4PQ==;
45c037
 };
45c037
 
7a016a
@@ -1269,7 +1272,7 @@ dhcpd.conf file:
45c037
 .PP
45c037
 .nf
45c037
 key DHCP_UPDATER {
45c037
-  algorithm HMAC-MD5.SIG-ALG.REG.INT;
45c037
+  algorithm hmac-md5;
45c037
   secret pRP5FapFoJ95JEL06sv4PQ==;
45c037
 };
45c037
 
7a016a
@@ -2742,7 +2745,8 @@ statement
45c037
 The \fInext-server\fR statement is used to specify the host address of
45c037
 the server from which the initial boot file (specified in the
c72a79
 \fIfilename\fR statement) is to be loaded.  \fIServer-name\fR should
45c037
-be a numeric IP address or a domain name.
45c037
+be a numeric IP address or a domain name.  If no \fInext-server\fR statement
45c037
+applies to a given client, the address 0.0.0.0 is used.
45c037
 .RE
45c037
 .PP
45c037
 The