From: Ted Lemon <source@isc.org>
Date: Thu, 22 Mar 2001 07:01:11 +0000 (+0000)
Subject: fix up dhclient script defaults.
X-Git-Tag: V3-BETA-2-PATCH-23~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e47988bfd7ba387c28fc6d0470ab451138cf72e8;p=thirdparty%2Fdhcp.git

fix up dhclient script defaults.
---

diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index e26802280..ccd376ea3 100644
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -446,10 +446,6 @@ struct lease_state {
 # define CL_DEFAULT_BOOTP_POLICY P_ACCEPT
 #endif
 
-#ifndef CL_DEFAULT_SCRIPT_NAME
-# define CL_DEFAULT_SCRIPT_NAME "/etc/dhclient-script"
-#endif
-
 #ifndef CL_DEFAULT_REQUESTED_OPTIONS
 # define CL_DEFAULT_REQUESTED_OPTIONS \
 	{ DHO_SUBNET_MASK, \
@@ -877,6 +873,10 @@ typedef unsigned char option_mask [16];
 #define _PATH_DHCLIENT_CONF	"/etc/dhclient.conf"
 #endif
 
+#ifndef _PATH_DHCLIENT_SCRIPT
+#define _PATH_DHCLIENT_SCRIPT	"/sbin/dhclient-script"
+#endif
+
 #ifndef _PATH_DHCLIENT_PID
 #define _PATH_DHCLIENT_PID	"/var/run/dhclient.pid"
 #endif
@@ -1749,6 +1749,7 @@ char *piaddr PROTO ((struct iaddr));
 extern const char *path_dhclient_conf;
 extern const char *path_dhclient_db;
 extern const char *path_dhclient_pid;
+extern char *path_dhclient_script;
 extern int interfaces_requested;
 
 extern struct client_config top_level_config;