diff options
| author | Kevin Steves <stevesk@cvs.openbsd.org> | 2006-12-16 15:13:46 +0000 |
|---|---|---|
| committer | Kevin Steves <stevesk@cvs.openbsd.org> | 2006-12-16 15:13:46 +0000 |
| commit | 0b6b7a29350caab939d33a4da9e03c397889dade (patch) | |
| tree | 5e755be2a7e2a68fee367c619fe7abf7d98b9ef9 | |
| parent | 38265a8de2c57a407626e320d797b1241f9746aa (diff) | |
make /sbin/dhclient-script consistent with other paths; ok henning@
| -rw-r--r-- | sbin/dhclient/clparse.c | 6 | ||||
| -rw-r--r-- | sbin/dhclient/dhcpd.h | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c index d6c62d3c387..542b791751e 100644 --- a/sbin/dhclient/clparse.c +++ b/sbin/dhclient/clparse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clparse.c,v 1.30 2006/12/15 14:56:38 stevesk Exp $ */ +/* $OpenBSD: clparse.c,v 1.31 2006/12/16 15:13:45 stevesk Exp $ */ /* Parser for dhclient config and lease files... */ @@ -45,8 +45,6 @@ extern struct interface_info *ifi; -char client_script_name[] = "/sbin/dhclient-script"; - /* * client-conf-file :== client-declarations EOF * client-declarations :== <nil> @@ -72,7 +70,7 @@ read_client_conf(void) config->backoff_cutoff = 15; config->initial_interval = 3; config->bootp_policy = ACCEPT; - config->script_name = client_script_name; + config->script_name = _PATH_DHCLIENT_SCRIPT; config->requested_options [config->requested_option_count++] = DHO_SUBNET_MASK; config->requested_options diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h index 003c575e4d8..646e6789f12 100644 --- a/sbin/dhclient/dhcpd.h +++ b/sbin/dhclient/dhcpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcpd.h,v 1.53 2006/11/27 19:32:17 stevesk Exp $ */ +/* $OpenBSD: dhcpd.h,v 1.54 2006/12/16 15:13:45 stevesk Exp $ */ /* * Copyright (c) 2004 Henning Brauer <henning@openbsd.org> @@ -224,6 +224,7 @@ struct protocol { #define _PATH_DHCLIENT_CONF "/etc/dhclient.conf" #define _PATH_DHCLIENT_DB "/var/db/dhclient.leases" +#define _PATH_DHCLIENT_SCRIPT "/sbin/dhclient-script" #define DHCPD_LOG_FACILITY LOG_DAEMON /* External definitions... */ |