projects
/
oweals
/
tinc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ed0bf28
)
Small change to the way the environment is copied.
author
Ivo Timmermans
<ivo@lychnis.net>
Sat, 4 Nov 2000 13:25:15 +0000
(13:25 +0000)
committer
Ivo Timmermans
<ivo@lychnis.net>
Sat, 4 Nov 2000 13:25:15 +0000
(13:25 +0000)
src/net.c
patch
|
blob
|
history
diff --git
a/src/net.c
b/src/net.c
index f8f84bcd3b900fac5709b9425b302e6da1dd2fbe..4e00341632872ae153e91d7a2a38368e742d9c29 100644
(file)
--- 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.
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.6
0 2000/11/04 11:49:57 guus
Exp $
+ $Id: net.c,v 1.35.4.6
1 2000/11/04 13:25:15 zarq
Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-88,6
+88,8
@@
int execute_script(const char* name)
pid_t pid;
char **env;
extern char **environment; /* From tincd.c; contains our env */
pid_t pid;
char **env;
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);
@@
-107,7
+109,8
@@
int execute_script(const char* name)
/* Child here */
env = xmalloc(sizeof(environment) + 1 * sizeof(char*));
/* Child here */
env = xmalloc(sizeof(environment) + 1 * sizeof(char*));
- memcpy(&(env[1]), environment, sizeof(environment));
+ while(p = environment, i = 0; *p != NULL; p++)
+ env[++i] = *p;
asprintf(&(env[0]), "IFNAME=%s", interface_name);
execle(scriptname, NULL, env);
/* No return on success */
asprintf(&(env[0]), "IFNAME=%s", interface_name);
execle(scriptname, NULL, env);
/* No return on success */