lib: All settings use configured namespace

[thirdparty/strongswan.git] / src / libstrongswan / plugins / pkcs11 / pkcs11_manager.c

diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c b/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c
index 8bda5b66fafab43b3ab81919926d072784d617a4..96c4a180ddd3b9acb40806891979b0f54c9e73b7 100644 (file)
--- a/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c
+++ b/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c
@@ -338,7 +338,7 @@ pkcs11_manager_t *pkcs11_manager_create(pkcs11_manager_token_event_t cb,
        );
 
        enumerator = lib->settings->create_section_enumerator(lib->settings,
-                                                                               "libstrongswan.plugins.pkcs11.modules");
+                                                                               "%s.plugins.pkcs11.modules", lib->ns);
        while (enumerator->enumerate(enumerator, &module))
        {
                INIT(entry,
@@ -346,7 +346,7 @@ pkcs11_manager_t *pkcs11_manager_create(pkcs11_manager_token_event_t cb,
                );
 
                entry->path = lib->settings->get_str(lib->settings,
-                               "libstrongswan.plugins.pkcs11.modules.%s.path", NULL, module);
+                               "%s.plugins.pkcs11.modules.%s.path", NULL, lib->ns, module);
                if (!entry->path)
                {
                        DBG1(DBG_CFG, "PKCS11 module '%s' lacks library path", module);
@@ -355,8 +355,8 @@ pkcs11_manager_t *pkcs11_manager_create(pkcs11_manager_token_event_t cb,
                }
                entry->lib = pkcs11_library_create(module, entry->path,
                                                lib->settings->get_bool(lib->settings,
-                                                       "libstrongswan.plugins.pkcs11.modules.%s.os_locking",
-                                                       FALSE, module));
+                                                       "%s.plugins.pkcs11.modules.%s.os_locking",
+                                                       FALSE, lib->ns, module));
                if (!entry->lib)
                {
                        free(entry);