X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=5b2fe0dbdd2f1a5a37bf9410376cace842988970;hb=417f36a07990ff9bc7de7d4e63e57146bef0dd75;hp=f8f84bcd3b900fac5709b9425b302e6da1dd2fbe;hpb=ed0bf283e37642f9f7673f664713a16d916bd70f;p=tinc

diff --git a/src/net.c b/src/net.c
index f8f84bcd..5b2fe0db 100644
--- a/src/net.c
+++ b/src/net.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net.c,v 1.35.4.60 2000/11/04 11:49:57 guus Exp $
+    $Id: net.c,v 1.35.4.63 2000/11/04 14:52:40 guus Exp $
 */
 
 #include "config.h"
@@ -86,10 +86,7 @@ int execute_script(const char* name)
 {
   char *scriptname;
   pid_t pid;
-  char **env;
-  extern char **environment;  /* From tincd.c; contains our env */
-
-  asprintf(&scriptname, "%s/%s", confbase, name);
+  char *s;
 
   if((pid = fork()) < 0)
     {
@@ -100,16 +97,15 @@ int execute_script(const char* name)
 
   if(pid)
     {
-      free(scriptname);
       return 0;
     }
 
   /* Child here */
 
-  env = xmalloc(sizeof(environment) + 1 * sizeof(char*));
-  memcpy(&(env[1]), environment, sizeof(environment));
-  asprintf(&(env[0]), "IFNAME=%s", interface_name);
-  execle(scriptname, NULL, env);
+  asprintf(&scriptname, "%s/%s", confbase, name);
+  asprintf(&s, "IFNAME=%s", interface_name);
+  putenv(s);
+  execl(scriptname, NULL);
   /* No return on success */
   
   if(errno != ENOENT)  /* Ignore if the file does not exist */