rpms/dhcp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Add interface-mtu to the list of default requested DHCP options (#566873)

Browse Source
This commit is contained in:
Jiří Popelka 2010-02-22 16:11:24 +00:00
parent de0a7afcfd
commit 1bab4538a8
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dhcp-4.1.1-default-requested-options.patch
View File

@ -1,16 +1,16 @@
diff -up dhcp-4.1.1/client/clparse.c.requested dhcp-4.1.1/client/clparse.c
--- dhcp-4.1.1/client/clparse.c.requested 2010-01-20 17:18:14.000000000 +0100
+++ dhcp-4.1.1/client/clparse.c 2010-01-20 17:18:14.000000000 +0100
--- dhcp-4.1.1/client/clparse.c.requested 2010-02-22 16:45:15.000000000 +0100
+++ dhcp-4.1.1/client/clparse.c 2010-02-22 16:45:58.000000000 +0100
@@ -37,7 +37,7 @@
struct client_config top_level_config;
-#define NUM_DEFAULT_REQUESTED_OPTS 9
+#define NUM_DEFAULT_REQUESTED_OPTS 12
+#define NUM_DEFAULT_REQUESTED_OPTS 13
struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 1];
static void parse_client_default_duid(struct parse *cfile);
@@ -111,6 +111,21 @@ isc_result_t read_client_conf ()
@@ -111,6 +111,26 @@ isc_result_t read_client_conf ()
option_code_hash_lookup(&default_requested_options[8],
dhcpv6_universe.code_hash, &code, 0, MDL);
@ -28,6 +28,11 @@ diff -up dhcp-4.1.1/client/clparse.c.requested dhcp-4.1.1/client/clparse.c
+ code = DHO_NTP_SERVERS;
+ option_code_hash_lookup(&default_requested_options[11],
+ dhcp_universe.code_hash, &code, 0, MDL);
+
+ /* 13 */
+ code = DHO_INTERFACE_MTU;
+ option_code_hash_lookup(&default_requested_options[12],
+ dhcp_universe.code_hash, &code, 0, MDL);
+
for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
if (default_requested_options[code] == NULL)

8
dhcp-4.1.1-manpages.patch
View File

@ -352,9 +352,9 @@ diff -up dhcp-4.1.1/client/dhclient.8.man dhcp-4.1.1/client/dhclient.8
+.BR
+ subnet-mask, broadcast-address, time-offset, routers,
+.BR
+ domain-name, domain-name-servers, host-name, nis-domain,
+ domain-name, domain-name-servers, host-name, name-servers,
+.BR
+ nis-servers, ntp-servers
+ domain-search, nis-domain, nis-servers, ntp-servers, interface-mtu
+
The
-.B -x
@ -476,8 +476,8 @@ diff -up dhcp-4.1.1/client/dhclient.conf.5.man dhcp-4.1.1/client/dhclient.conf.5
-domain-name, domain-name-servers and host-name options. Note that if
-you enter a 'request' statement, you over-ride this default and these
-options will not be requested.
+domain-name, domain-name-servers host-name, nis-domain, nis-servers,
+and ntp-servers options. Note that if you enter a 'request' statement,
+domain-name, domain-name-servers, host-name, name-servers, domain-search, nis-domain, nis-servers,
+ntp-servers and interface-mtu options. Note that if you enter a 'request' statement,
+you over-ride this default and these options will not be requested.
.PP
In some cases, it may be desirable to send no parameter request list

9
dhcp.spec
View File

@ -13,7 +13,7 @@
Summary: Dynamic host configuration protocol software
Name: dhcp
Version: %{basever}
Release: 10%{?dist}
Release: 11%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# dcantrell maintaining the package) made incorrect use of the epoch and
# that's why it is at 12 now. It should have never been used, but it was.
@ -155,8 +155,8 @@ libdhcpctl and libomapi static libraries are also included in this package.
# Also, return EXIT_FAILURE when the usage() screen is displayed (stop parsing)
%patch6 -p1 -b .usage
# Add NIS domain, NIS servers, and NTP servers to the list of default
# requested DHCP options
# Add NIS domain, NIS servers, NTP servers and interface-mtu
# to the list of default requested DHCP options
%patch7 -p1 -b .requested
# Handle Xen partial UDP checksums
@ -500,6 +500,9 @@ fi
%attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
%changelog
* Mon Feb 22 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.1-11
- Add interface-mtu to the list of default requested DHCP options (#566873)
* Fri Feb 19 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.1-10
- Fix pm-utils/sleep.d/ directory ownership conflict