From 2c21891ec156adc304f4012343d75808a1036d0f Mon Sep 17 00:00:00 2001
From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Mon, 13 Nov 2006 09:31:40 +0000
Subject: Attempt at rational signal handling when in the management hold
 state.

During management hold, ignore SIGUSR1/SIGHUP signals
thrown with the "signal" command.

Also, "signal" command will now apply remapping as
specified with the --remap-usr1 option.

When a signal entered using the "signal" command from a management
hold is ignored, output:

>HOLD:Waiting for hold release


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@1458 e7ae566f-a301-0410-adde-c780ea21d3b5
---
 openvpn.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'openvpn.c')

diff --git a/openvpn.c b/openvpn.c
index cb6af50..66ade22 100644
--- a/openvpn.c
+++ b/openvpn.c
@@ -107,8 +107,6 @@ main (int argc, char *argv[])
   return 1;
 #endif
 
-  pre_init_signal_catch ();
-
   CLEAR (c);
 
   /* signify first time for components which can
@@ -124,6 +122,9 @@ main (int argc, char *argv[])
        */
       do
 	{
+	  /* enter pre-initialization mode with regard to signal handling */
+	  pre_init_signal_catch ();
+
 	  /* zero context struct but leave first_time member alone */
 	  context_clear_all_except_first_time (&c);
 
-- 
cgit