summaryrefslogtreecommitdiffstats
path: root/src/openvpn/pkcs11.c
diff options
context:
space:
mode:
authorSteffan Karger <steffan@karger.me>2015-04-27 16:28:57 +0200
committerGert Doering <gert@greenie.muc.de>2015-05-26 16:10:08 +0200
commitf025de005d719201a69ad0313d545a1ddd244752 (patch)
tree03ff203a86684ef2a98bc04c80263f78d05b5928 /src/openvpn/pkcs11.c
parent7895590cf1f513f508132f8987fee8fef2759df7 (diff)
downloadopenvpn-f025de005d719201a69ad0313d545a1ddd244752.tar.gz
openvpn-f025de005d719201a69ad0313d545a1ddd244752.tar.xz
openvpn-f025de005d719201a69ad0313d545a1ddd244752.zip
Call daemon() before initializing crypto library
But keep the chdir to / at the place where deamon() was before, to preserve the current behaviour wrt relative paths in the config. This should fix the issue reported in trac #480, without changing the behaviour visible to the end user. Note that by moving the daemon() call to an earlier stage of the init process, we no longer have to call platform_mlockall() again, or do a pkcs11_forkFixup(). Signed-off-by: Steffan Karger <steffan@karger.me> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <1430144937-4149-1-git-send-email-steffan@karger.me> URL: http://article.gmane.org/gmane.network.openvpn.devel/9609 Signed-off-by: Gert Doering <gert@greenie.muc.de> (cherry picked from commit da9b292733e929a2900dc32d37f0424c3d588366)
Diffstat (limited to 'src/openvpn/pkcs11.c')
-rw-r--r--src/openvpn/pkcs11.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/openvpn/pkcs11.c b/src/openvpn/pkcs11.c
index 3a15ef6..a1f13c5 100644
--- a/src/openvpn/pkcs11.c
+++ b/src/openvpn/pkcs11.c
@@ -336,11 +336,6 @@ pkcs11_terminate () {
);
}
-void
-pkcs11_forkFixup () {
- pkcs11h_forkFixup ();
-}
-
bool
pkcs11_addProvider (
const char * const provider,