Merged 2.0.4 changes.

svn merge -r 737:749 $SO/trunk/openvpn


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@750 e7ae566f-a301-0410-adde-c780ea21d3b5

1 files changed, 1 insertions, 1 deletions

diff --git a/init.c b/init.c
index d6c13b2..503e75c 100644
--- a/init.c
+++ b/init.c
@@ -2474,7 +2474,7 @@ init_instance (struct context *c, const struct env_set *env, const unsigned int
     else if (child)
       crypto_flags = CF_INIT_TLS_MULTI;
     do_init_crypto (c, crypto_flags);
-    if (IS_SIG (c))
+    if (IS_SIG (c) && !child)
       goto sig;
   }