diff options
| author | Stef Walter <stefw@gnome.org> | 2012-04-02 15:36:34 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2012-04-02 16:07:20 +0200 |
| commit | 85f9d306832964f6d6412392f335e1fa3f3efd8b (patch) | |
| tree | 1e9ef89d7cec004b01557d531fa43e80fe06a5b6 /p11-kit | |
| parent | d4c5661a695b5fc4a0126a4583e30ef70aea54ac (diff) | |
Add tests for enable-in and disable-in
Diffstat (limited to 'p11-kit')
| -rw-r--r-- | p11-kit/Makefile.am | 8 | ||||
| -rw-r--r-- | p11-kit/modules.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/p11-kit/Makefile.am b/p11-kit/Makefile.am index cd445f1..8605c15 100644 --- a/p11-kit/Makefile.am +++ b/p11-kit/Makefile.am @@ -58,10 +58,10 @@ libp11_kit_testable_la_LDFLAGS = \ libp11_kit_testable_la_SOURCES = $(MODULE_SRCS) libp11_kit_testable_la_CFLAGS = \ - -DP11_SYSTEM_CONFIG_FILE=\""$(abs_top_builddir)/tests/files/system-pkcs11.conf"\" \ - -DP11_SYSTEM_CONFIG_MODULES=\""$(abs_top_builddir)/tests/files/system-modules"\" \ - -DP11_USER_CONFIG_FILE=\""$(abs_top_builddir)/tests/files/user-pkcs11.conf"\" \ - -DP11_USER_CONFIG_MODULES=\""$(abs_top_builddir)/tests/files/user-modules"\" \ + -DP11_SYSTEM_CONFIG_FILE=\""$(abs_top_srcdir)/tests/files/system-pkcs11.conf"\" \ + -DP11_SYSTEM_CONFIG_MODULES=\""$(abs_top_srcdir)/tests/files/system-modules"\" \ + -DP11_USER_CONFIG_FILE=\""$(abs_top_srcdir)/tests/files/user-pkcs11.conf"\" \ + -DP11_USER_CONFIG_MODULES=\""$(abs_top_srcdir)/tests/files/user-modules"\" \ -DP11_MODULE_PATH=\""$(abs_top_builddir)/tests/.libs"\" \ $(NULL) diff --git a/p11-kit/modules.c b/p11-kit/modules.c index 569a735..0498708 100644 --- a/p11-kit/modules.c +++ b/p11-kit/modules.c @@ -734,7 +734,7 @@ _p11_kit_initialize_registered_unlocked_reentrant (void) while (_p11_hash_next (&iter, NULL, (void **)&mod)) { /* Skip all modules that aren't registered */ - if (!mod->name) + if (mod->name == NULL || !is_module_enabled_unlocked (mod->name, mod->config)) continue; rv = initialize_module_unlocked_reentrant (mod); @@ -1000,7 +1000,7 @@ p11_kit_registered_name_to_module (const char *name) if (gl.modules) { mod = find_module_for_name_unlocked (name); - if (mod) + if (mod != NULL && is_module_enabled_unlocked (name, mod->config)) module = mod->funcs; } |