X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincd.c;h=75482357b3d2fdff5c2752da6a03118ed01d3b4c;hb=cea3d8f3056d3c6aaaef473443240b8470c8ea2d;hp=ca873ef2e37a4309f8f29d97d9c8e490578e6717;hpb=35932fe6c8cb481eb687f98424776ce429570c21;p=tinc

diff --git a/src/tincd.c b/src/tincd.c
index ca873ef2..75482357 100644
--- a/src/tincd.c
+++ b/src/tincd.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: tincd.c,v 1.10.4.17 2000/10/29 00:02:20 guus Exp $
+    $Id: tincd.c,v 1.10.4.19 2000/10/29 09:19:27 guus Exp $
 */
 
 #include "config.h"
@@ -44,7 +44,6 @@
 #include <xalloc.h>
 
 #include "conf.h"
-#include "encr.h"
 #include "net.h"
 #include "netutl.h"
 #include "protocol.h"
@@ -252,7 +251,7 @@ int detach(void)
       if(pid) /* parent process */
 	{
 	  signal(SIGTERM, parent_exit);
-//	  sleep(600); /* wait 10 minutes */
+	  sleep(600); /* wait 10 minutes */
 	  exit(1);
 	}
     }
@@ -447,7 +446,7 @@ main(int argc, char **argv, char **envp)
         {
           main_loop();
           cleanup_and_exit(1);
-         }
+        }
       
       syslog(LOG_ERR, _("Unrecoverable error"));
       cp_trace();
@@ -459,7 +458,7 @@ main(int argc, char **argv, char **envp)
         }
       else
         {
-          syslog(LOG_ERR, _("Aieee! Not restarting."));
+          syslog(LOG_ERR, _("Not restarting."));
           exit(0);
         }
     }
@@ -470,6 +469,7 @@ sigterm_handler(int a)
 {
   if(debug_lvl > DEBUG_NOTHING)
     syslog(LOG_NOTICE, _("Got TERM signal"));
+
   cleanup_and_exit(0);
 }
 
@@ -505,7 +505,7 @@ sigsegv_handler(int a)
     }
   else
     {
-      syslog(LOG_NOTICE, _("Aieee! Not restarting."));
+      syslog(LOG_NOTICE, _("Not restarting."));
       exit(0);
     }
 }
@@ -514,7 +514,7 @@ RETSIGTYPE
 sighup_handler(int a)
 {
   if(debug_lvl > DEBUG_NOTHING)
-    syslog(LOG_NOTICE, _("Got HUP signal, rereading configuration and restarting"));
+    syslog(LOG_NOTICE, _("Got HUP signal"));
   sighup = 1;
 }
 
@@ -536,9 +536,9 @@ RETSIGTYPE
 sigusr2_handler(int a)
 {
   dump_subnet_list();
-//  if(debug_lvl > DEBUG_NOTHING)
-//   syslog(LOG_NOTICE, _("Got USR2 signal, forcing new key generation"));
 /* FIXME: reprogram this.
+  if(debug_lvl > DEBUG_NOTHING)
+   syslog(LOG_NOTICE, _("Got USR2 signal, forcing new key generation"));
   regenerate_keys();
 */
 }