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.64 2000/11/04 15:32:05 zarq Exp $
*/
#include "config.h"
{
char *scriptname;
pid_t pid;
- char **env;
- extern char **environment; /* From tincd.c; contains our env */
-
- asprintf(&scriptname, "%s/%s", confbase, name);
+ char *s;
if((pid = fork()) < 0)
{
if(pid)
{
- free(scriptname);
return 0;
}
/* 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(&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 */
if(errno != ENOENT) /* Ignore if the file does not exist */
void close_network_connections(void)
{
conn_list_t *p;
- char *scriptname;
cp
for(p = conn_list; p != NULL; p = p->next)
{
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"));