X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=bf3d6b74f36e38c1c3547ed257264dd7fcef5468;hp=695f1f7ed9a757d7239c522f51839b02a075aa8e;hb=44e9d6a2872fac55f7eb701ba576ed9f39a22e08;hpb=4c502b005bfd24821e817c134e8a442a5f4606de

diff --git a/src/process.c b/src/process.c
index 695f1f7e..bf3d6b74 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1,7 +1,7 @@
 /*
     process.c -- process management functions
-    Copyright (C) 1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>,
-                       2000 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 1999-2001 Ivo Timmermans <itimmermans@bigfoot.com>,
+                  2000,2001 Guus Sliepen <guus@sliepen.warande.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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.17 2000/11/28 08:59:27 zarq Exp $
+    $Id: process.c,v 1.1.2.23 2001/07/24 20:03:40 guus Exp $
 */
 
 #include "config.h"
@@ -35,7 +35,6 @@
 #include <unistd.h>
 #include <termios.h>
 
-#include <list.h>
 #include <pidfile.h>
 #include <utils.h>
 #include <xalloc.h>
@@ -159,11 +158,13 @@ cp
 
   /* If we succeeded in doing that, detach */
 
+  closelog();
+
   if(do_detach)
     {
       if(daemon(0, 0) < 0)
 	{
-	  fprintf(stderr, _("Couldn't detach from terminal: %m"));
+	  fprintf(stderr, _("Couldn't detach from terminal: %s"), strerror(errno));
 	  return -1;
 	}
 
@@ -220,7 +221,7 @@ cp
   /* No return on success */
   
   if(errno != ENOENT)	/* Ignore if the file does not exist */
-    exit(-1);		/* Some error while trying execl(). */
+    exit(1);		/* Some error while trying execl(). */
   else
     exit(0);
 }
@@ -308,7 +309,7 @@ sigsegv_square(int a, siginfo_t *info, void *b)
 {
   syslog(LOG_ERR, _("Got another SEGV signal: not restarting"));
   cp_trace();
-  exit(0);
+  exit(1);
 }
 
 RETSIGTYPE
@@ -374,6 +375,16 @@ unexpected_signal_handler(int a, siginfo_t *info, void *b)
   cp_trace();
 }
 
+RETSIGTYPE
+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));
+    cp_trace();
+  }
+}
+
 struct {
   int signal;
   void (*handler)(int, siginfo_t *, void *);
@@ -382,11 +393,12 @@ struct {
   { SIGTERM, sigterm_handler },
   { SIGQUIT, sigquit_handler },
   { SIGSEGV, sigsegv_handler },
-  { SIGPIPE, NULL },
+  { SIGPIPE, ignore_signal_handler },
   { SIGINT, sigint_handler },
   { SIGUSR1, sigusr1_handler },
   { SIGUSR2, sigusr2_handler },
-  { SIGCHLD, NULL },
+  { SIGCHLD, ignore_signal_handler },
+  { SIGALRM, ignore_signal_handler },
   { 0, NULL }
 };
 
@@ -406,7 +418,7 @@ setup_signals(void)
   for(i = 0; i < NSIG; i++) 
     {
       act.sa_sigaction = unexpected_signal_handler;
-      sigaction(sighandlers[i].signal, &act, NULL);
+      sigaction(i, &act, NULL);
     }
 
   /* Then, for each known signal that we want to catch, assign a
@@ -415,7 +427,7 @@ setup_signals(void)
     {
       act.sa_sigaction = sighandlers[i].handler;
       if(sigaction(sighandlers[i].signal, &act, NULL) < 0)
-	fprintf(stderr, _("Installing signal handler for signal %d (%s) failed: %m\n"),
-		sighandlers[i].signal, strsignal(sighandlers[i].signal));
+	fprintf(stderr, _("Installing signal handler for signal %d (%s) failed: %s\n"),
+		sighandlers[i].signal, strsignal(sighandlers[i].signal), strerror(errno));
     }
 }