From 2749a115e8ba55fdfc0045536bcdbf0f25925e69 Mon Sep 17 00:00:00 2001
From: mellon <mellon@NetBSD.org>
Date: Sun, 23 Jul 2000 07:13:57 +0000
Subject: [PATCH] Back out previons revision in favour of a simpler solution.

---
 usr.sbin/dhcp/client/dhclient.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/usr.sbin/dhcp/client/dhclient.c b/usr.sbin/dhcp/client/dhclient.c
index ed3e38e9c31e..3b0e505fbc89 100644
--- a/usr.sbin/dhcp/client/dhclient.c
+++ b/usr.sbin/dhcp/client/dhclient.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$Id: dhclient.c,v 1.30 2000/07/23 05:34:53 thorpej Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 Internet Software Consortium.  All rights reserved.\n";
+"$Id: dhclient.c,v 1.31 2000/07/23 07:13:57 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -2269,27 +2269,17 @@ void script_write_params (client, prefix, lease)
 int script_go (client)
 	struct client_state *client;
 {
-	static char *client_path;
 	int rval;
 	char *scriptName;
 	char *argv [2];
 	char **envp;
 	char *epp [3];
 	char reason [] = "REASON=NBI";
+	static char client_path [] = CLIENT_PATH;
 	int i;
 	struct string_list *sp, *next;
 	int pid, wpid, wstatus;
 
-	if (client_path == NULL) {
-		client_path = dmalloc (strlen(CLIENT_PATH) +
-		    strlen("PATH=") + 1, MDL);
-		if (!client_path) {
-			log_error ("No memory for PATH environment variable.");
-			return 0;
-		}
-		sprintf (client_path, "PATH=%s", CLIENT_PATH);
-	}
-
 	if (client) {
 		scriptName = client -> config -> script_name;
 		envp = dmalloc ((client -> envc + 2) * sizeof (char *),