Ticket #563: 0001-fix-management-hold.patch

src/openvpn/init.c

@@ -1825 +1825 @@
  * Possible hold on initialization
  */
 static bool
-do_hold (void)
+do_hold (struct context *c)
 {
 #ifdef ENABLE_MANAGEMENT
   if (management)
     {
+      /* if c is defined, daemonize before hold */
+      if (c && c->options.daemon && management_should_daemonize (management))
+        do_init_first_time (c);
+
       /* block until management hold is released */
       if (management_hold (management))
         return true;
@@ -1895 +1899 @@
   c->persist.restart_sleep_seconds = 0;
 
   /* do managment hold on context restart, i.e. second, third, fourth, etc. initialization */
-  if (do_hold ())
+  if (do_hold (NULL))
     sec = 0;
 
   if (sec)
@@ -1914 +1918 @@
   if (!c->first_time)
     socket_restart_pause (c);
   else
-    do_hold (); /* do management hold on first context initialization */
+    do_hold (NULL); /* do management hold on first context initialization */
 }
 
 /*
@@ -3221 +3225 @@
             }
 
           /* initial management hold, called early, before first context initialization */
-          do_hold ();
+          do_hold (c);
           if (IS_SIG (c))
             {
               msg (M_WARN, "Signal received from management interface, exiting");