diff options
| author | Steffan Karger <steffan@karger.me> | 2015-07-09 23:35:59 +0200 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2015-07-13 21:15:24 +0200 |
| commit | 7bde2e1b19e66af22c26c90e1187a4365c9087fc (patch) | |
| tree | e6b44f847eadc0ef04311a35e1e2b97e8a9fd8fb /src/openvpn/openvpn.c | |
| parent | 4188a2dcdc32d36ccbd85396cf40d54d75e2ca3e (diff) | |
| download | openvpn-7bde2e1b19e66af22c26c90e1187a4365c9087fc.tar.gz openvpn-7bde2e1b19e66af22c26c90e1187a4365c9087fc.tar.xz openvpn-7bde2e1b19e66af22c26c90e1187a4365c9087fc.zip | |
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 <steffan@karger.me>
Acked-by: Gert Doering <gert@greenie.muc.de>
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 <gert@greenie.muc.de>
(cherry picked from commit 315f6fbc7f657a7f1127628bd714f468709d5185)
Diffstat (limited to 'src/openvpn/openvpn.c')
| -rw-r--r-- | src/openvpn/openvpn.c | 5 |
1 files changed, 4 insertions, 1 deletions
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) { |