Deleted Added
full compact
clparse.c (166602) clparse.c (228259)
1/* $OpenBSD: clparse.c,v 1.18 2004/09/15 18:15:18 henning Exp $ */
2
3/* Parser for dhclient config and lease files... */
4
5/*
6 * Copyright (c) 1997 The Internet Software Consortium.
7 * All rights reserved.
8 *

--- 27 unchanged lines hidden (view full) ---

36 * This software has been written for the Internet Software Consortium
37 * by Ted Lemon <mellon@fugue.com> in cooperation with Vixie
38 * Enterprises. To learn more about the Internet Software Consortium,
39 * see ``http://www.vix.com/isc''. To learn more about Vixie
40 * Enterprises, see ``http://www.vix.com''.
41 */
42
43#include <sys/cdefs.h>
1/* $OpenBSD: clparse.c,v 1.18 2004/09/15 18:15:18 henning Exp $ */
2
3/* Parser for dhclient config and lease files... */
4
5/*
6 * Copyright (c) 1997 The Internet Software Consortium.
7 * All rights reserved.
8 *

--- 27 unchanged lines hidden (view full) ---

36 * This software has been written for the Internet Software Consortium
37 * by Ted Lemon <mellon@fugue.com> in cooperation with Vixie
38 * Enterprises. To learn more about the Internet Software Consortium,
39 * see ``http://www.vix.com/isc''. To learn more about Vixie
40 * Enterprises, see ``http://www.vix.com''.
41 */
42
43#include <sys/cdefs.h>
44__FBSDID("$FreeBSD: head/sbin/dhclient/clparse.c 166602 2007-02-09 17:50:26Z emaste $");
44__FBSDID("$FreeBSD: head/sbin/dhclient/clparse.c 228259 2011-12-04 14:44:31Z dumbbell $");
45
46#include "dhcpd.h"
47#include "dhctoken.h"
48
49struct client_config top_level_config;
50struct interface_info *dummy_interfaces;
51extern struct interface_info *ifi;
52

--- 42 unchanged lines hidden (view full) ---

95 [top_level_config.requested_option_count++] = DHO_ROUTERS;
96 top_level_config.requested_options
97 [top_level_config.requested_option_count++] = DHO_DOMAIN_NAME;
98 top_level_config.requested_options
99 [top_level_config.requested_option_count++] =
100 DHO_DOMAIN_NAME_SERVERS;
101 top_level_config.requested_options
102 [top_level_config.requested_option_count++] = DHO_HOST_NAME;
45
46#include "dhcpd.h"
47#include "dhctoken.h"
48
49struct client_config top_level_config;
50struct interface_info *dummy_interfaces;
51extern struct interface_info *ifi;
52

--- 42 unchanged lines hidden (view full) ---

95 [top_level_config.requested_option_count++] = DHO_ROUTERS;
96 top_level_config.requested_options
97 [top_level_config.requested_option_count++] = DHO_DOMAIN_NAME;
98 top_level_config.requested_options
99 [top_level_config.requested_option_count++] =
100 DHO_DOMAIN_NAME_SERVERS;
101 top_level_config.requested_options
102 [top_level_config.requested_option_count++] = DHO_HOST_NAME;
103 top_level_config.requested_options
104 [top_level_config.requested_option_count++] = DHO_DOMAIN_SEARCH;
103
104 if ((cfile = fopen(path_dhclient_conf, "r")) != NULL) {
105 do {
106 token = peek_token(&val, cfile);
107 if (token == EOF)
108 break;
109 parse_client_statement(cfile, NULL, &top_level_config);
110 } while (1);

--- 833 unchanged lines hidden ---
105
106 if ((cfile = fopen(path_dhclient_conf, "r")) != NULL) {
107 do {
108 token = peek_token(&val, cfile);
109 if (token == EOF)
110 break;
111 parse_client_statement(cfile, NULL, &top_level_config);
112 } while (1);

--- 833 unchanged lines hidden ---