]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blob - src/patches/dhcp/dhcp-default-requested-options.patch
Merge remote-tracking branch 'mfischer/python' into next
[people/pmueller/ipfire-2.x.git] / src / patches / dhcp / dhcp-default-requested-options.patch
1 diff -up dhcp-4.3.0a1/client/clparse.c.requested dhcp-4.3.0a1/client/clparse.c
2 --- dhcp-4.3.0a1/client/clparse.c.requested 2013-12-19 15:13:27.276631307 +0100
3 +++ dhcp-4.3.0a1/client/clparse.c 2013-12-19 15:13:27.313630789 +0100
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 @@ -119,6 +119,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 "