j3d1/tinc
1
0
Fork 0
Code Issues1 Pull requests Releases Wiki Activity

Use putenv() instead of clumsy do-it-yourself in execute_script.

Browse source
This commit is contained in:
Ivo Timmermans 2000-11-04 14:16:46 +00:00
parent f83803c1bf
commit d38772ebc4
1 changed files with 5 additions and 10 deletions

15
src/net.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net.c,v 1.35.4.61 2000/11/04 13:25:15 zarq Exp $ $Id: net.c,v 1.35.4.62 2000/11/04 14:16:46 zarq Exp $
*/ */
#include "config.h" #include "config.h"
@ -86,10 +86,7 @@ int execute_script(const char* name)
{ {
char *scriptname; char *scriptname;
pid_t pid; pid_t pid;
char **env; char *s;
extern char **environment; /* From tincd.c; contains our env */
char **p;
int i;
asprintf(&scriptname, "%s/%s", confbase, name); asprintf(&scriptname, "%s/%s", confbase, name);
@ -108,11 +105,9 @@ int execute_script(const char* name)
/* Child here */ /* Child here */
env = xmalloc(sizeof(environment) + 1 * sizeof(char*)); asprintf(&s, "IFNAME=%s", interface_name);
while(p = environment, i = 0; *p != NULL; p++) putenv(s);
env[++i] = *p; execl(scriptname, NULL);
asprintf(&(env[0]), "IFNAME=%s", interface_name);
execle(scriptname, NULL, env);
/* No return on success */ /* No return on success */
if(errno != ENOENT) /* Ignore if the file does not exist */ if(errno != ENOENT) /* Ignore if the file does not exist */