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