From: Ivo Timmermans <ivo@lychnis.net>
Date: Sat, 4 Nov 2000 15:32:05 +0000 (+0000)
Subject: In execute_script:
X-Git-Tag: release-1.0pre3~23
X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=15246df85d6171c92478541a835effb96d6085c4;p=tinc

In execute_script:
- add an environment variable NETNAME.
- chdir to the configuration directory before execing the script.
---

diff --git a/src/net.c b/src/net.c
index 5b2fe0db..016b86ad 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.63 2000/11/04 14:52:40 guus Exp $
+    $Id: net.c,v 1.35.4.64 2000/11/04 15:32:05 zarq Exp $
 */
 
 #include "config.h"
@@ -105,6 +105,25 @@ int execute_script(const char* name)
   asprintf(&scriptname, "%s/%s", confbase, name);
   asprintf(&s, "IFNAME=%s", interface_name);
   putenv(s);
+  free(s);
+
+  if(netname)
+    {
+      asprintf(&s, "NETNAME=%s", netname);
+      putenv(s);
+      free(s);
+    }
+  else
+    {
+      unsetenv("NETNAME");
+    }
+
+  if(chdir(confbase) < 0)
+    {
+      syslog(LOG_ERR, _("Couldn't chdir to `%s': %m"),
+	     confbase);
+    }
+  
   execl(scriptname, NULL);
   /* No return on success */