Small change to the way the environment is copied.

[oweals/tinc.git] / src / net.c

diff --git a/src/net.c b/src/net.c
index fb15b5ee0a3c0d97dec643b3fd4cd1ec520b22f9..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.
 
-    $Id: net.c,v 1.35.4.59 2000/11/04 10:37:27 guus Exp $
+    $Id: net.c,v 1.35.4.61 2000/11/04 13:25:15 zarq Exp $
 */
 
 #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 */
+  char **p;
+  int i;
 
   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*));
-  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 */
@@ -903,7 +906,6 @@ cp
 void close_network_connections(void)
 {
   conn_list_t *p;
-  char *scriptname;
 cp
   for(p = conn_list; p != NULL; p = p->next)
     {
@@ -920,10 +922,11 @@ cp
         myself = NULL;
       }
 
-  /* Execute tinc-down script right before shutting down the interface */
+  close(tap_fd);
+
+  /* Execute tinc-down script right after shutting down the interface */
   execute_script("tinc-down");
 
-  close(tap_fd);
   destroy_conn_list();
 
   syslog(LOG_NOTICE, _("Terminating"));