From 315f6fbc7f657a7f1127628bd714f468709d5185 Mon Sep 17 00:00:00 2001 From: Steffan Karger Date: Thu, 9 Jul 2015 23:35:59 +0200 Subject: fix regression: query password before becoming daemon The init sequence was changed to daemonize before the crypto init to fix issues on FreeBSD some commits ago. This introduced a regression where we would no longer query for passwords before daemonizing, as described in trac #574 and #576. This commit restores the correct order, and adds a bit of const correctness since we're touching this now code anyway. Signed-off-by: Steffan Karger Acked-by: Gert Doering Message-Id: <1436477759-5884-1-git-send-email-steffan@karger.me> URL: http://article.gmane.org/gmane.network.openvpn.devel/9901 Signed-off-by: Gert Doering --- src/openvpn/openvpn.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/openvpn/openvpn.c') diff --git a/src/openvpn/openvpn.c b/src/openvpn/openvpn.c index 00bd570..d05acde 100644 --- a/src/openvpn/openvpn.c +++ b/src/openvpn/openvpn.c @@ -228,7 +228,10 @@ openvpn_main (int argc, char *argv[]) /* test crypto? */ if (do_test_crypto (&c.options)) break; - + + /* Query passwords before becoming a daemon */ + init_query_passwords (&c); + /* become a daemon if --daemon */ if (c.first_time) { -- cgit