X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fconfig.c;h=f818f7ac3671008e2277a4c24e668d8e47d8f7c8;hb=acd9ae252049d89ca7907995d94b6c6b0b643379;hp=2e7611a57591412d68f32325400cc45c4e4a8185;hpb=37c1f71d519420addb71c6137e551ecb51336f7c;p=src%2Fapp-framework-binder.git diff --git a/src/config.c b/src/config.c index 2e7611a5..f818f7ac 100644 --- a/src/config.c +++ b/src/config.c @@ -114,10 +114,10 @@ PUBLIC AFB_error configLoadFile (AFB_session * session, AFB_config *cliconfig) { session->config->smack= cliconfig->smack; } - if (cliconfig->smack == NULL) { - session->config->plugins = "all"; + if (cliconfig->ldpaths == NULL) { + session->config->ldpaths = PLUGIN_INSTALL_DIR; } else { - session->config->plugins= cliconfig->plugins; + session->config->ldpaths= cliconfig->ldpaths; } // if no session dir create a default path from rootdir @@ -190,8 +190,8 @@ PUBLIC AFB_error configLoadFile (AFB_session * session, AFB_config *cliconfig) { session->config->smack = strdup (json_object_get_string (value)); } - if (!cliconfig->plugins && json_object_object_get_ex (AFBConfig, "plugins", &value)) { - session->config->plugins = strdup (json_object_get_string (value)); + if (!cliconfig->ldpaths && json_object_object_get_ex (AFBConfig, "plugins", &value)) { + session->config->ldpaths = strdup (json_object_get_string (value)); } if (!cliconfig->setuid && json_object_object_get_ex (AFBConfig, "setuid", &value)) { @@ -256,7 +256,7 @@ PUBLIC void configStoreFile (AFB_session * session) { json_object_object_add (AFBConfig, "rootapi" , json_object_new_string (session->config->rootapi)); json_object_object_add (AFBConfig, "rootbase" , json_object_new_string (session->config->rootbase)); json_object_object_add (AFBConfig, "smack" , json_object_new_string (session->config->smack)); - json_object_object_add (AFBConfig, "plugins" , json_object_new_string (session->config->plugins)); + json_object_object_add (AFBConfig, "plugins" , json_object_new_string (session->config->ldpaths)); json_object_object_add (AFBConfig, "sessiondir" , json_object_new_string (session->config->sessiondir)); json_object_object_add (AFBConfig, "pidfile" , json_object_new_string (session->config->pidfile)); json_object_object_add (AFBConfig, "setuid" , json_object_new_string (session->config->setuid));