svn merge -r 845:854 $SO/trunk/openvpn .

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

1 files changed, 10 insertions, 0 deletions

diff --git a/manage.c b/manage.c
index dca5500..127e933 100644
--- a/manage.c
+++ b/manage.c
@@ -1863,6 +1863,16 @@ management_would_hold (struct management *man)
 }
 
 /*
+ * Return true if (from the management interface's perspective) OpenVPN should
+ * daemonize.
+ */
+bool
+management_should_daemonize (struct management *man)
+{
+  return management_would_hold (man) || man->settings.up_query_passwords;
+}
+
+/*
  * If the hold flag is enabled, hibernate until a management client releases the hold.
  * Return true if the caller should not sleep for an additional time interval.
  */