philipp / rpms / dhcp

Forked from rpms/dhcp 4 years ago
Clone

Blame SOURCES/dhcp-4.2.5-manpages.patch

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