X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=8ca8733f72c74f8c619b1c9906c5801d83e029fd;hp=525836b82b7a30d25b6bfc30c496812816704919;hb=cf0e133e191cb40954bf5b6ee0a579442fe4b60b;hpb=66067cc9c1347fb2de35660d531fdd4be8aede6a

diff --git a/src/process.c b/src/process.c
index 525836b8..8ca8733f 100644
--- a/src/process.c
+++ b/src/process.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: process.c,v 1.1.2.29 2001/10/28 10:16:18 guus Exp $
+    $Id: process.c,v 1.1.2.32 2001/11/03 22:53:02 guus Exp $
 */
 
 #include "config.h"
@@ -44,6 +44,7 @@
 #include "subnet.h"
 #include "device.h"
 #include "connection.h"
+#include "device.h"
 
 #include "system.h"
 
@@ -199,17 +200,29 @@ void _execute_script(const char *name)
   char *scriptname;
   char *s;
 cp
+#ifdef HAVE_UNSETENV
+  unsetenv("NETNAME");
+  unsetenv("DEVICE");
+  unsetenv("INTERFACE");
+#endif
+
   if(netname)
     {
       asprintf(&s, "NETNAME=%s", netname);
       putenv(s);	/* Don't free s! see man 3 putenv */
     }
-#ifdef HAVE_UNSETENV
-  else
+
+  if(device)
     {
-      unsetenv("NETNAME");
+      asprintf(&s, "DEVICE=%s", device);
+      putenv(s);	/* Don't free s! see man 3 putenv */
+    }
+
+  if(interface)
+    {
+      asprintf(&s, "INTERFACE=%s", interface);
+      putenv(s);	/* Don't free s! see man 3 putenv */
     }
-#endif
 
   chdir("/");
   
@@ -396,7 +409,7 @@ ignore_signal_handler(int a, siginfo_t *info, void *b)
 {
   if(debug_lvl >= DEBUG_SCARY_THINGS)
   {
-    syslog(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a));
+    syslog(LOG_DEBUG, _("Ignored signal %d (%s)"), a, strsignal(a));
     cp_trace();
   }
 }
@@ -433,10 +446,14 @@ setup_signals(void)
      ignored. */
   for(i = 0; i < NSIG; i++) 
     {
-      act.sa_sigaction = unexpected_signal_handler;
+      if(!do_detach)
+        act.sa_sigaction = SIG_DFL;
+      else
+        act.sa_sigaction = unexpected_signal_handler;
       sigaction(i, &act, NULL);
     }
 
+  /* If we didn't detach, allow coredumps */
   if(!do_detach)
     sighandlers[3].handler = SIG_DFL;