current/SOURCES/dhcp-4.2.0-default-requested-options.patch

diff -up dhcp-4.2.0/client/clparse.c.requested dhcp-4.2.0/client/clparse.c
--- dhcp-4.2.0/client/clparse.c.requested       2010-07-21 13:29:05.000000000 +0200
+++ dhcp-4.2.0/client/clparse.c 2010-07-21 13:50:29.000000000 +0200
@@ -37,7 +37,7 @@
 
 struct client_config top_level_config;
 
-#define NUM_DEFAULT_REQUESTED_OPTS     9
+#define NUM_DEFAULT_REQUESTED_OPTS     14
 struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 1];
 
 static void parse_client_default_duid(struct parse *cfile);
@@ -111,6 +111,31 @@ isc_result_t read_client_conf ()
        option_code_hash_lookup(&default_requested_options[8],
                                dhcpv6_universe.code_hash, &code, 0, MDL);
 
+       /* 10 */
+       code = DHO_NIS_DOMAIN;
+       option_code_hash_lookup(&default_requested_options[9],
+                               dhcp_universe.code_hash, &code, 0, MDL);
+
+       /* 11 */
+       code = DHO_NIS_SERVERS;
+       option_code_hash_lookup(&default_requested_options[10],
+                               dhcp_universe.code_hash, &code, 0, MDL);
+
+       /* 12 */
+       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);
+
+       /* 14 */
+       code = DHO_DOMAIN_SEARCH;
+       option_code_hash_lookup(&default_requested_options[13],
+                               dhcp_universe.code_hash, &code, 0, MDL);
+
        for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
                if (default_requested_options[code] == NULL)
                        log_fatal("Unable to find option definition for "
1	guillomovitch	335360	diff -up dhcp-4.2.0/client/clparse.c.requested dhcp-4.2.0/client/clparse.c
2			--- dhcp-4.2.0/client/clparse.c.requested 2010-07-21 13:29:05.000000000 +0200
3			+++ dhcp-4.2.0/client/clparse.c 2010-07-21 13:50:29.000000000 +0200
4			@@ -37,7 +37,7 @@
5
6			struct client_config top_level_config;
7
8			-#define NUM_DEFAULT_REQUESTED_OPTS 9
9			+#define NUM_DEFAULT_REQUESTED_OPTS 14
10			struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 1];
11
12			static void parse_client_default_duid(struct parse *cfile);
13			@@ -111,6 +111,31 @@ isc_result_t read_client_conf ()
14			option_code_hash_lookup(&default_requested_options[8],
15			dhcpv6_universe.code_hash, &code, 0, MDL);
16
17			+ /* 10 */
18			+ code = DHO_NIS_DOMAIN;
19			+ option_code_hash_lookup(&default_requested_options[9],
20			+ dhcp_universe.code_hash, &code, 0, MDL);
21			+
22			+ /* 11 */
23			+ code = DHO_NIS_SERVERS;
24			+ option_code_hash_lookup(&default_requested_options[10],
25			+ dhcp_universe.code_hash, &code, 0, MDL);
26			+
27			+ /* 12 */
28			+ code = DHO_NTP_SERVERS;
29			+ option_code_hash_lookup(&default_requested_options[11],
30			+ dhcp_universe.code_hash, &code, 0, MDL);
31			+
32			+ /* 13 */
33			+ code = DHO_INTERFACE_MTU;
34			+ option_code_hash_lookup(&default_requested_options[12],
35			+ dhcp_universe.code_hash, &code, 0, MDL);
36			+
37			+ /* 14 */
38			+ code = DHO_DOMAIN_SEARCH;
39			+ option_code_hash_lookup(&default_requested_options[13],
40			+ dhcp_universe.code_hash, &code, 0, MDL);
41			+
42			for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
43			if (default_requested_options[code] == NULL)
44			log_fatal("Unable to find option definition for "