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:12:10 +0200 |
commit | 315f6fbc7f657a7f1127628bd714f468709d5185 (patch) | |
tree | 1ee80a051f914227a278ae8abcaed33e7492586f /src/openvpn/init.h | |
parent | 9884e20810bda737c7708ff587e09cc0bb8475c7 (diff) | |
download | openvpn-315f6fbc7f657a7f1127628bd714f468709d5185.tar.gz openvpn-315f6fbc7f657a7f1127628bd714f468709d5185.tar.xz openvpn-315f6fbc7f657a7f1127628bd714f468709d5185.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>
Diffstat (limited to 'src/openvpn/init.h')
-rw-r--r-- | src/openvpn/init.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/openvpn/init.h b/src/openvpn/init.h index d1908ed..a819bd2 100644 --- a/src/openvpn/init.h +++ b/src/openvpn/init.h @@ -63,6 +63,11 @@ void init_instance_handle_signals (struct context *c, const struct env_set *env, void init_instance (struct context *c, const struct env_set *env, const unsigned int flags); +/** + * Query for private key and auth-user-pass username/passwords. + */ +void init_query_passwords (const struct context *c); + void do_route (const struct options *options, struct route_list *route_list, struct route_ipv6_list *route_ipv6_list, |