From e5e0dd7534be5fb96032fb733ca36a09cb067f17 Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@tinc-vpn.org>
Date: Mon, 14 Jun 2004 14:32:10 +0000
Subject: [PATCH] Clean up environment after executing scripts.

---
 src/process.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/process.c b/src/process.c
index c1dd2d0f..7500259f 100644
--- a/src/process.c
+++ b/src/process.c
@@ -363,6 +363,7 @@ bool execute_script(const char *name, char **envp)
 	int status, len;
 	struct stat s;
 	char *scriptname;
+	int i;
 
 	cp();
 
@@ -386,8 +387,8 @@ bool execute_script(const char *name, char **envp)
 #ifdef HAVE_PUTENV
 	/* Set environment */
 	
-	while(*envp)
-		putenv(*envp++);
+	for(i = 0; envp[i]; i++)
+		putenv(envp[i]);
 #endif
 
 	scriptname[len - 1] = '\"';
@@ -395,7 +396,13 @@ bool execute_script(const char *name, char **envp)
 
 	free(scriptname);
 
-	/* Unset environment? */
+	/* Unset environment */
+
+	for(i = 0; envp[i]; i++) {
+		char *e = strchr(envp[i], '=');
+		if(e)
+			putenv(strndupa(envp[i], e - envp[i]));
+	}
 
 #ifdef WEXITSTATUS
 	if(status != -1) {
-- 
2.39.5