From 9259b50fe4e204dfa10f4ef26ec37a85f57d47b4 Mon Sep 17 00:00:00 2001
From: stevesk <stevesk@openbsd.org>
Date: Sat, 16 Dec 2006 15:13:45 +0000
Subject: make /sbin/dhclient-script consistent with other paths; ok henning@

---
 sbin/dhclient/clparse.c | 6 ++----
 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... */
-- 
cgit v1.2.3-59-g8ed1b