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

This commit is contained in:
Tobias Brunner 2019-05-07 18:34:49 +02:00
parent 21280da9f5
commit 532060c0fa
1 changed files with 8 additions and 2 deletions

View File

@ -427,6 +427,8 @@ static void remove_callback()
*/ */
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
char *plugins;
atexit(library_deinit); atexit(library_deinit);
if (!library_init(NULL, "pki")) if (!library_init(NULL, "pki"))
{ {
@ -438,8 +440,12 @@ int main(int argc, char *argv[])
fprintf(stderr, "integrity check of pki failed\n"); fprintf(stderr, "integrity check of pki failed\n");
exit(SS_RC_DAEMON_INTEGRITY); exit(SS_RC_DAEMON_INTEGRITY);
} }
if (!lib->plugins->load(lib->plugins, plugins = getenv("PKI_PLUGINS");
lib->settings->get_str(lib->settings, "pki.load", 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); exit(SS_RC_INITIALIZATION_FAILED);
} }