diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2012-10-30 18:39:45 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2012-10-30 18:39:45 +0000 |
| commit | 1721d77e423e622f2a9d018651a15c36a5f3a17e (patch) | |
| tree | f6597ed300615a71bdb45bd274857071508779db /sbin/dhclient/clparse.c | |
| parent | 1a882f5e4d6022913f24a2a3ba0c2f51fcde1e38 (diff) | |
Nuke dhclient-script and dhclient.conf 'script' directive. Do all
interface and route configuration via ioctl's and routing sockets.
This will break configurations using local enhancements of
dhclient-script, which will now require alternate arrangements.
Committing early to allow time to identify and develop required
alternatives.
Several proddings by deraadt@.
Diffstat (limited to 'sbin/dhclient/clparse.c')
| -rw-r--r-- | sbin/dhclient/clparse.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c index 877c4330008..72a1cd9065c 100644 --- a/sbin/dhclient/clparse.c +++ b/sbin/dhclient/clparse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clparse.c,v 1.41 2012/10/27 23:08:53 krw Exp $ */ +/* $OpenBSD: clparse.c,v 1.42 2012/10/30 18:39:44 krw Exp $ */ /* Parser for dhclient config and lease files... */ @@ -66,7 +66,6 @@ read_client_conf(void) config->backoff_cutoff = 15; config->initial_interval = 3; config->bootp_policy = ACCEPT; - config->script_name = _PATH_DHCLIENT_SCRIPT; config->requested_options [config->requested_option_count++] = DHO_SUBNET_MASK; config->requested_options @@ -145,7 +144,6 @@ read_client_leases(void) * TOK_REBOOT number | * TOK_BACKOFF_CUTOFF number | * TOK_INITIAL_INTERVAL number | - * TOK_SCRIPT string | * interface-declaration | * TOK_LEASE client-lease-statement | * TOK_ALIAS client-lease-statement | @@ -222,9 +220,6 @@ parse_client_statement(FILE *cfile) case TOK_INITIAL_INTERVAL: parse_lease_time(cfile, &config->initial_interval); return; - case TOK_SCRIPT: - config->script_name = parse_string(cfile); - return; case TOK_INTERFACE: parse_interface_declaration(cfile); return; |