X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=bd991e905689ea910fdfa0101467718eeb3c062a;hp=f8f84bcd3b900fac5709b9425b302e6da1dd2fbe;hb=d38772ebc42f5ad1d946ee89d955f5d43bb2fe8c;hpb=ed0bf283e37642f9f7673f664713a16d916bd70f diff --git a/src/net.c b/src/net.c index f8f84bcd..bd991e90 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.62 2000/11/04 14:16:46 zarq Exp $ */ #include "config.h" @@ -86,8 +86,7 @@ int execute_script(const char* name) { char *scriptname; pid_t pid; - char **env; - extern char **environment; /* From tincd.c; contains our env */ + char *s; asprintf(&scriptname, "%s/%s", confbase, name); @@ -106,10 +105,9 @@ int execute_script(const char* name) /* 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(&s, "IFNAME=%s", interface_name); + putenv(s); + execl(scriptname, NULL); /* No return on success */ if(errno != ENOENT) /* Ignore if the file does not exist */