2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fa08c8d..f871d8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@ Copyright (C) 2002-2005 OpenVPN Solutions LLC <info@openvpn.net>
 
 $Id$
 
+2005.11.xx -- Version 2.1-beta8
+
+* --remap-usr1 will now also remap signals thrown during
+  initialization.
+
 2005.11.12 -- Version 2.1-beta7
 
 * Allow blank passwords to be passed via the management
diff --git a/init.c b/init.c
index 53d1851..b3a999e 100644
--- a/init.c
+++ b/init.c
@@ -2383,7 +2383,10 @@ init_instance_handle_signals (struct context *c, const struct env_set *env, cons
    * a management hold.
    */
   if (IS_SIG (c))
-    uninit_management_callback ();  
+    {
+      remap_signal (c);
+      uninit_management_callback ();  
+    }
 }
 
 /*