From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 7 May 2019 16:34:49 +0000 (+0200)
Subject: pki: Plugins to load may be defined via PKI_PLUGINS env variable
X-Git-Tag: 5.8.0rc1~5^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=532060c0fa18f89e3969c7258e4827f95d5fdab0;p=thirdparty%2Fstrongswan.git

pki: Plugins to load may be defined via PKI_PLUGINS env variable
---

diff --git a/src/pki/pki.c b/src/pki/pki.c
index d03e96f9b3..bb6b278d46 100644
--- a/src/pki/pki.c
+++ b/src/pki/pki.c
@@ -427,6 +427,8 @@ static void remove_callback()
  */
 int main(int argc, char *argv[])
 {
+	char *plugins;
+
 	atexit(library_deinit);
 	if (!library_init(NULL, "pki"))
 	{
@@ -438,8 +440,12 @@ int main(int argc, char *argv[])
 		fprintf(stderr, "integrity check of pki failed\n");
 		exit(SS_RC_DAEMON_INTEGRITY);
 	}
-	if (!lib->plugins->load(lib->plugins,
-			lib->settings->get_str(lib->settings, "pki.load", PLUGINS)))
+	plugins = getenv("PKI_PLUGINS");
+	if (!plugins)
+	{
+		plugins = lib->settings->get_str(lib->settings, "pki.load", PLUGINS);
+	}
+	if (!lib->plugins->load(lib->plugins, plugins))
 	{
 		exit(SS_RC_INITIALIZATION_FAILED);
 	}